davinci_dtr_test_kit 0.17.1 → 0.18.0

data/lib/davinci_dtr_test_kit/full_ehr/v2.2.0/request/dtr_next_question_request_validation_test.rb

@@ -0,0 +1,85 @@
+require_relative '../../../urls'
+require_relative '../../../cross_suite/v2.2.0/multi_request_message_helper'
+require_relative '../../short_circuit_interaction_verification'
+require_relative '../../../cross_suite/v2.2.0/questionnaire_helper'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRV220NextQuestionRequestValidationTest < Inferno::Test
+    include URLs
+    include MultiRequestMessageHelper
+    include ShortCircuitInteractionVerification
+    include QuestionnaireHelper
+
+    id :dtr_full_ehr_v220_nq_request_validation
+    title 'Next Question request is valid'
+    description %(
+      This test validates the conformance of the client's request to the
+      [DTR Next Question Input Parameters](https://hl7.org/fhir/us/davinci-dtr/2.2.0/en/StructureDefinition-dtr-next-question-input-parameters.html)
+      structure. Because there is only a single in parameter, the request is allowed to be just a
+      [DTR Questionnaire Response for adaptive form](https://hl7.org/fhir/us/davinci-dtr/2.2.0/en/StructureDefinition-dtr-questionnaireresponse-adapt.html)
+      per [FHIR's operation request requirements](https://www.hl7.org/fhir/R4/operations.html#request).
+
+      The test verifies the presence of mandatory elements and that elements with required bindings contain appropriate
+      values. CodeableConcept element bindings will fail if none of their codings have a code/system belonging
+      to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system are not found in
+      the valueset.
+    )
+
+    def target_tags
+      tags = [CLIENT_NEXT_TAG]
+      tags << config.options[:dtr_workflow_tag] if config.options[:dtr_workflow_tag].present?
+
+      tags
+    end
+
+    run do
+      check_for_short_circuit(ok_message: config.options[:short_circuit_pass_message])
+      check_for_adaptive_short_circuit
+
+      requests = load_tagged_requests(*target_tags)
+      skip_if requests.blank?, 'A $next-question request must be made prior to running this test'
+
+      requests.each_with_index do |qp_request, request_index|
+        unless qp_request.url == next_url
+          add_request_message(
+            'error',
+            "Request made to wrong URL: #{qp_request.url}. Should instead be to #{next_url}.",
+            request_index
+          )
+        end
+
+        input_resource = parse_fhir_request_entity(qp_request.request_body, 'Request', request_index)
+        unless input_resource.present?
+          add_request_message(
+            'error',
+            'Request does not contain a recognized FHIR resource',
+            request_index
+          )
+          next
+        end
+
+        if input_resource.is_a?(FHIR::QuestionnaireResponse)
+          resource_is_valid?(resource: input_resource,
+                             profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaireresponse-adapt|2.2.0',
+                             message_prefix: request_prefix(request_index))
+
+        elsif input_resource.is_a?(FHIR::Parameters)
+          resource_is_valid?(resource: input_resource,
+                             profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-next-question-input-parameters|2.2.0',
+                             message_prefix: request_prefix(request_index))
+        else
+          add_request_message(
+            'error',
+            'Request body contains an unexpected resource type: ' \
+            "expected Parameters or QuestionnaireResponse, got '#{input_resource.class}'",
+            request_index
+          )
+        end
+      end
+
+      assert_no_error_messages(
+        "#{requests_with_errors_prefix}Non-conformant $next-question request(s). See Messages for details."
+      )
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/full_ehr/v2.2.0/request/dtr_questionnaire_package_request_validation_test.rb

@@ -0,0 +1,89 @@
+require_relative '../../../urls'
+require_relative '../../../cross_suite/v2.2.0/multi_request_message_helper'
+require_relative '../../short_circuit_interaction_verification'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRV220QuestionnairePackageRequestValidationTest < Inferno::Test
+    include URLs
+    include MultiRequestMessageHelper
+    include ShortCircuitInteractionVerification
+
+    id :dtr_full_ehr_v220_qp_request_validation
+    title 'Questionnaire Package request is valid'
+    description %(
+      This test validates the conformance of the client's request to the
+      [DTR Questionnaire Package Input Parameters](https://hl7.org/fhir/us/davinci-dtr/2.2.0/en/StructureDefinition-dtr-qpackage-input-parameters.html)
+      structure.
+
+      The test verifies the presence of mandatory elements and that elements with required bindings contain appropriate
+      values. CodeableConcept element bindings will fail if none of their codings have a code/system belonging
+      to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system are not found in
+      the valueset.
+    )
+
+    def target_tags
+      tags = [QUESTIONNAIRE_PACKAGE_TAG]
+      tags << config.options[:dtr_workflow_tag] if config.options[:dtr_workflow_tag].present?
+
+      tags
+    end
+
+    run do
+      check_for_short_circuit(ok_message: config.options[:short_circuit_pass_message])
+
+      requests = load_tagged_requests(*target_tags)
+      skip_if requests.blank?, 'A Questionnaire Package request must be made prior to running this test'
+
+      requests.each_with_index do |qp_request, request_index|
+        unless qp_request.url == questionnaire_package_url
+          add_request_message(
+            'error',
+            "Request made to wrong URL: #{qp_request.url}. Should instead be to #{questionnaire_package_url}.",
+            request_index
+          )
+        end
+
+        input_params = parse_fhir_request_entity(qp_request.request_body, 'Request', request_index)
+        unless input_params.present?
+          add_request_message(
+            'error',
+            'Request does not contain a recognized FHIR resource',
+            request_index
+          )
+          next
+        end
+        unless input_params.is_a?(FHIR::Parameters)
+          add_request_message(
+            'error',
+            'Request is not FHIR Parameters resource',
+            request_index
+          )
+          next
+        end
+
+        resource_is_valid?(resource: input_params,
+                           profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters|2.2.0',
+                           message_prefix: request_prefix(request_index))
+
+        check_for_required_invocation_details(input_params, request_index)
+      end
+
+      assert_no_error_messages(
+        "#{requests_with_errors_prefix}Non-conformant $questionnaire-package request(s). See Messages for details."
+      )
+    end
+
+    # - Zero or more canonicals specifying the URL and, (optionally) the version of the Questionnaire(s) to retrieve;
+    # - A CRD/PAS context ID, and/or
+    # - One or more Request or Encounter resources
+    def check_for_required_invocation_details(params, request_index)
+      return if params.parameter.any? { |param| ['questionnaire', 'order', 'context'].include?(param.name) }
+
+      add_request_message(
+        'error',
+        'Request does not contain a Questionnaire canonical, a request resource, or context from CRD or PAS.',
+        request_index
+      )
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/full_ehr/v2.2.0/response/dtr_next_question_response_validation_test.rb

@@ -0,0 +1,85 @@
+require_relative '../../../urls'
+require_relative '../../../tags'
+require_relative '../../../cross_suite/v2.2.0/multi_request_message_helper'
+require_relative '../../short_circuit_interaction_verification'
+require_relative '../../../cross_suite/v2.2.0/questionnaire_helper'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRV220NextQuestionResponseValidationTest < Inferno::Test
+    include URLs
+    include MultiRequestMessageHelper
+    include ShortCircuitInteractionVerification
+    include QuestionnaireHelper
+
+    id :dtr_full_ehr_v220_nq_response_validation
+    title 'Next Question responses are valid'
+    description %(
+      This test validates the conformance of the Inferno's simulated response to the
+      output of the [DTR Next Question Operation](https://hl7.org/fhir/us/davinci-dtr/2.2.0/en/OperationDefinition-DTR-Questionnaire-next-question.html).
+      Because there is a single out parameter named "return" and its type is a FHIR QuestionnaireResponse resource,
+      the [Parameters format is not used](https://www.hl7.org/fhir/R4/operations.html#response)
+      and the response is expected to be a raw QuestionnaireResponse conforming to the
+      [DTR Questionnaire Response for adaptive form](https://hl7.org/fhir/us/davinci-dtr/2.2.0/en/StructureDefinition-dtr-questionnaireresponse-adapt.html)
+      profile.
+
+      The test verifies the presence of mandatory elements and that elements with required bindings contain appropriate
+      values. CodeableConcept element bindings will fail if none of their codings have a code/system belonging
+      to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system are not found in
+      the valueset.
+    )
+    simulation_verification
+
+    def target_tags
+      tags = [CLIENT_NEXT_TAG]
+      tags << config.options[:dtr_workflow_tag] if config.options[:dtr_workflow_tag].present?
+
+      tags
+    end
+
+    run do
+      check_for_short_circuit(ok_message: config.options[:short_circuit_pass_message])
+      check_for_adaptive_short_circuit
+
+      requests = load_tagged_requests(*target_tags)
+      skip_if requests.blank?, 'A Next Question request must be made prior to running this test'
+
+      requests.each_with_index do |nq_request, request_index|
+        unless nq_request.url == next_url
+          add_request_message(
+            'error',
+            "Request made to wrong URL: #{nq_request.url}. Should instead be to #{next_url}.",
+            request_index
+          )
+        end
+
+        response_body = parse_fhir_request_entity(nq_request.response_body, 'Response', request_index)
+        unless response_body.present?
+          add_request_message(
+            'error',
+            'Response does not contain a recognized FHIR resource',
+            request_index
+          )
+          next
+        end
+
+        questionnaire_response = questionnaire_response_from_next_question_response(response_body)
+        if questionnaire_response.present?
+          resource_is_valid?(validator: :no_unknown_extensions,
+                             resource: questionnaire_response,
+                             profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaireresponse-adapt|2.2.0',
+                             message_prefix: request_prefix(request_index))
+        else
+          add_request_message(
+            'error',
+            'Response does not contain a QuestionnaireResponse',
+            request_index
+          )
+        end
+      end
+
+      assert_no_error_messages(
+        "#{requests_with_errors_prefix}Non-conformant $next-question response(s). See Messages for details."
+      )
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/full_ehr/v2.2.0/response/dtr_questionnaire_package_response_validation_test.rb

@@ -0,0 +1,77 @@
+require_relative '../../../urls'
+require_relative '../../../tags'
+require_relative '../../../cross_suite/v2.2.0/multi_request_message_helper'
+require_relative '../../short_circuit_interaction_verification'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRV220QuestionnairePackageResponseValidationTest < Inferno::Test
+    include URLs
+    include MultiRequestMessageHelper
+    include ShortCircuitInteractionVerification
+
+    id :dtr_full_ehr_v220_qp_response_validation
+    title 'Questionnaire Package response is valid'
+    description %(
+      This test validates the conformance of the Inferno's simulated response to the
+      [DTR Questionnaire Package Output Parameters](https://hl7.org/fhir/us/davinci-dtr/2.2.0/en/StructureDefinition-dtr-qpackage-output-parameters.html)
+      structure.
+
+      The test verifies the presence of mandatory elements and that elements with required bindings contain appropriate
+      values. CodeableConcept element bindings will fail if none of their codings have a code/system belonging
+      to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system are not found in
+      the valueset.
+    )
+    simulation_verification
+
+    def target_tags
+      tags = [QUESTIONNAIRE_PACKAGE_TAG]
+      tags << config.options[:dtr_workflow_tag] if config.options[:dtr_workflow_tag].present?
+
+      tags
+    end
+
+    run do
+      check_for_short_circuit(ok_message: config.options[:short_circuit_pass_message])
+
+      requests = load_tagged_requests(*target_tags)
+      skip_if requests.blank?, 'A Questionnaire Package request must be made prior to running this test'
+
+      requests.each_with_index do |qp_request, request_index|
+        unless qp_request.url == questionnaire_package_url
+          add_request_message(
+            'error',
+            "Request made to wrong URL: #{qp_request.url}. Should instead be to #{questionnaire_package_url}.",
+            request_index
+          )
+        end
+
+        output_params = parse_fhir_request_entity(qp_request.response_body, 'Response', request_index)
+        unless output_params.present?
+          add_request_message(
+            'error',
+            'Response does not contain a recognized FHIR resource',
+            request_index
+          )
+          next
+        end
+        unless output_params.is_a?(FHIR::Parameters)
+          add_request_message(
+            'error',
+            'Response is not FHIR Parameters resource',
+            request_index
+          )
+          next
+        end
+
+        resource_is_valid?(validator: :no_unknown_extensions,
+                           resource: output_params,
+                           profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters|2.2.0',
+                           message_prefix: request_prefix(request_index))
+      end
+
+      assert_no_error_messages(
+        "#{requests_with_errors_prefix}Non-conformant $questionnaire-package response(s). See Messages for details."
+      )
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/full_ehr/v2.2.0/workflows/dtr_full_ehr_workflow_adaptive_group.rb

@@ -0,0 +1,24 @@
+require_relative '../dtr_full_ehr_abstract_adaptive_group'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRV220WorkflowAdaptive < DTRFullEHRV220AbstractAdaptive
+    title 'Adaptive Questionnaire'
+    id :dtr_full_ehr_v220_workflow_adaptive
+    description <<~DESCRIPTION
+      During this group, the DTR Full EHR will demonstrate its ability to complete
+      an adaptive Questionnaire.
+    DESCRIPTION
+    run_as_group
+
+    config(
+      options: {
+        qp_single_use: true,
+        dtr_workflow_tag: 'adaptive',
+        qp_response_template_fixture: File.join('dinner_adaptive',
+                                                'parameters_questionnaire_dinner_order_adaptive.json'),
+        nq_questionnaire_template_fixture: File.join('dinner_adaptive',
+                                                     'dinner_order_adaptive_next_question_template.json')
+      }
+    )
+  end
+end

data/lib/davinci_dtr_test_kit/full_ehr/v2.2.0/workflows/dtr_full_ehr_workflow_standard_group.rb

@@ -0,0 +1,21 @@
+require_relative '../dtr_full_ehr_abstract_standard_group'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRV220WorkflowStandard < DTRFullEHRV220AbstractStandard
+    title 'Standard Questionnaire'
+    id :dtr_full_ehr_v220_workflow_standard
+    description <<~DESCRIPTION
+      During this group, the DTR Full EHR will demonstrate its ability to complete
+      a standard Questionnaire.
+    DESCRIPTION
+    run_as_group
+
+    config(
+      options: {
+        qp_single_use: true,
+        dtr_workflow_tag: 'static',
+        qp_response_template_fixture: File.join('dinner_static', 'parameters_questionnaire_dinner_order_static.json')
+      }
+    )
+  end
+end

data/lib/davinci_dtr_test_kit/generator/ig_metadata.rb

@@ -0,0 +1,21 @@
+module DaVinciDTRTestKit
+  class Generator
+    class IGMetadata
+      attr_accessor :ig_version, :profiles
+
+      def to_hash
+        {
+          ig_version:,
+          profiles: profiles.map(&:to_hash)
+        }
+      end
+
+      # Directory/file-safe identifier for a profile. DTR profile ids are already
+      # unique per resource type (eg dtr-questionnaireresponse vs
+      # dtr-questionnaireresponse-adapt), so the profile url's own id segment is sufficient.
+      def snake_case_for_profile(profile_metadata)
+        profile_metadata.profile_url.split('StructureDefinition/').last.underscore
+      end
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/generator/profile_metadata_extractor.rb

@@ -0,0 +1,57 @@
+require 'inferno/dsl/must_support_metadata_extractor'
+require 'inferno/dsl/profile_metadata'
+
+module DaVinciDTRTestKit
+  class Generator
+    class ProfileMetadataExtractor
+      attr_accessor :profile_url, :ig_resources, :element_scope
+
+      def initialize(profile_url, ig_resources, element_scope = 'snapshot')
+        self.profile_url = profile_url
+        self.ig_resources = ig_resources
+        self.element_scope = element_scope
+      end
+
+      def profile_metadata
+        @profile_metadata ||=
+          Inferno::DSL::ProfileMetadata.new(
+            resource:,
+            profile_url:,
+            profile_name:,
+            profile_version:,
+            must_supports:
+          )
+      end
+
+      def profile
+        @profile ||= ig_resources.profile_by_url(profile_url)
+      end
+
+      def profile_elements
+        @profile_elements ||= element_scope == 'snapshot' ? profile.snapshot.element : profile.differential.element
+      end
+
+      def resource
+        profile.type
+      end
+
+      def profile_name
+        profile.title.gsub('  ', ' ')
+      end
+
+      def profile_version
+        profile.version
+      end
+
+      def must_support_metadata_extractor
+        @must_support_metadata_extractor ||=
+          Inferno::DSL::MustSupportMetadataExtractor.new(profile_elements, profile, resource, ig_resources)
+      end
+
+      def must_supports
+        @must_supports ||=
+          must_support_metadata_extractor.must_supports
+      end
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/generator.rb

@@ -0,0 +1,117 @@
+require 'active_support/all'
+require 'inferno/ext/fhir_models'
+require 'inferno/entities/entity'
+require 'inferno/entities/attributes'
+require 'inferno/entities/ig'
+
+require_relative 'generator/ig_metadata'
+require_relative 'generator/profile_metadata_extractor'
+
+module DaVinciDTRTestKit
+  # Generates profile metadata files (used by the test kit's must support tests)
+  # from a DTR IG package into cross_suite/generated/<ig_version>.
+  class Generator
+    TARGET_IG_VERSIONS = ['2.2.0'].freeze
+
+    # Must support checks are scoped to only differential for standard and adaptive
+    TARGET_PROFILES_AND_ELEMENT_SCOPE = {
+      'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/DTR-QPackageBundle' => 'snapshot',
+      'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters' => 'snapshot',
+      'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-base-questionnaire' => 'snapshot',
+      'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaire-adapt' => 'differential',
+      'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaire-adapt-search' => 'snapshot',
+      'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-std-questionnaire' => 'differential'
+    }.freeze
+
+    def self.generate
+      ig_packages = Dir.glob(File.join(Dir.pwd, 'lib', 'davinci_dtr_test_kit', 'igs', '*.tgz'))
+
+      ig_packages.each do |ig_package|
+        generator = new(ig_package)
+        next unless TARGET_IG_VERSIONS.include?(generator.ig_version_from_file_name)
+
+        generator.generate
+      end
+    end
+
+    attr_accessor :ig_resources, :ig_metadata, :ig_file_name
+
+    def initialize(ig_file_name)
+      self.ig_file_name = ig_file_name
+    end
+
+    def ig_version_from_file_name
+      File.basename(ig_file_name, '.tgz').split('_').last
+    end
+
+    def generate
+      puts "Generating profile metadata for IG #{File.basename(ig_file_name)}"
+      load_ig_package
+      extract_metadata
+      write_profile_metadata
+    end
+
+    def load_ig_package
+      self.ig_resources = Inferno::Entities::IG.from_file(
+        ig_file_name,
+        standalone_resources_directory: ig_file_name.chomp('.tgz')
+      )
+    end
+
+    # DTR profiles analyzed include the Questionnaires
+    def target_profiles
+      ig_resources.resources_by_type['StructureDefinition'].select do |structure_definition|
+        TARGET_PROFILES_AND_ELEMENT_SCOPE.key?(structure_definition.url)
+      end
+    end
+
+    def extract_metadata
+      self.ig_metadata = IGMetadata.new
+      ig_metadata.ig_version = "v#{ig_resources.ig_resource.version}"
+      ig_metadata.profiles = target_profiles.map do |profile|
+        element_scope = TARGET_PROFILES_AND_ELEMENT_SCOPE[profile.url]
+        profile_metadata = ProfileMetadataExtractor.new(profile.url, ig_resources, element_scope).profile_metadata
+
+        # handle gap when looking at differential
+        profile_metadata.must_supports[:recursive_elements] << 'item' if element_scope == 'differential'
+        add_parameters_slice_discriminators(profile_metadata) if questionnaire_package_output_parameters?(profile)
+
+        profile_metadata
+      end
+
+      FileUtils.mkdir_p(base_output_dir)
+      File.write(File.join(base_output_dir, 'metadata.yml'), YAML.dump(ig_metadata.to_hash))
+    end
+
+    def base_output_dir
+      File.join(__dir__, 'cross_suite', 'generated', ig_metadata.ig_version)
+    end
+
+    def write_profile_metadata
+      ig_metadata.profiles.each do |profile_metadata|
+        metadata_file_dir = File.join(base_output_dir, ig_metadata.snake_case_for_profile(profile_metadata))
+        FileUtils.mkdir_p(metadata_file_dir)
+        File.write(File.join(metadata_file_dir, 'metadata.yml'), YAML.dump(profile_metadata.to_hash))
+      end
+    end
+
+    def questionnaire_package_output_parameters?(profile)
+      profile.url == 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters'
+    end
+
+    # This is a workaround for Inferno Core treating slice discriminators defined with `patternString` as unsupported.
+    # The QuestionnairePackage Output Parameters profile slices `Parameters.parameter` by `name` (`packagebundle`
+    # and `outcome`), so replace only unsupported discriminators with equivalent value metadata. If Core gets updated
+    # to support `patternString`, this method becomes a no-op and can be removed.
+    def add_parameters_slice_discriminators(profile_metadata)
+      profile_metadata.must_supports[:slices].each do |slice|
+        next unless slice.dig(:discriminator, :type) == 'unsupported'
+
+        slice[:discriminator] = {
+          type: 'value',
+          values: [{ path: 'name', value: slice[:slice_name] }]
+        }
+      end
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/{dtr_options.rb → light_ehr/dtr_light_ehr_options.rb}

@@ -1,5 +1,5 @@
 module DaVinciDTRTestKit
-  module DTROptions
+  module DTRLightEHROptions
     SMART_2 = 'smart_app_launch_2'.freeze
 
     SMART_2_REQUIREMENT = { smart_app_launch_version: SMART_2 }.freeze

data/lib/davinci_dtr_test_kit/{dtr_light_ehr_suite.rb → light_ehr/v2.0.1/dtr_light_ehr_suite.rb}

@@ -1,7 +1,6 @@
 require 'us_core_test_kit'
 require 'tls_test_kit'
-require_relative 'version'
-require_relative 'dtr_options'
+require_relative '../dtr_light_ehr_options'
 require_relative 'profiles/questionnaire_response_group'
 require_relative 'profiles/coverage_group'
 require_relative 'profiles/communication_request_group'
@@ -12,9 +11,9 @@ require_relative 'profiles/nutrition_order_group'
 require_relative 'profiles/service_request_group'
 require_relative 'profiles/task_group'
 require_relative 'profiles/vision_prescription_group'
-require_relative 'client_groups/light_ehr/dtr_smart_ehr_launch'
-require_relative 'endpoints/mock_payer/light_ehr_supported_payer_endpoint'
-require_relative 'client_groups/light_ehr/dtr_light_ehr_supported_endpoints_group'
+require_relative 'dtr_smart_ehr_launch'
+require_relative '../endpoints/light_ehr_supported_payer_endpoint'
+require_relative 'dtr_light_ehr_supported_endpoints_group'
 require 'smart_app_launch/smart_stu1_suite'
 require 'smart_app_launch/smart_stu2_suite'
 require 'us_core_test_kit/generated/v3.1.1/us_core_test_suite'
@@ -22,8 +21,8 @@ require 'us_core_test_kit/generated/v3.1.1/us_core_test_suite'
 module DaVinciDTRTestKit
   class DTRLightEHRSuite < Inferno::TestSuite
     id :dtr_light_ehr
-    title 'Da Vinci DTR Light EHR Test Suite'
-    description File.read(File.join(__dir__, 'docs', 'dtr_light_ehr_suite_description_v201.md'))
+    title 'Da Vinci DTR Light EHR Test Suite v2.0.1'
+    description File.read(File.join(__dir__, 'dtr_light_ehr_suite_description_v201.md'))
 
     links [
       {
@@ -104,7 +103,7 @@ module DaVinciDTRTestKit
       )
 
       group from: :smart_discovery_stu2 do
-        required_suite_options DTROptions::SMART_2_REQUIREMENT
+        required_suite_options DTRLightEHROptions::SMART_2_REQUIREMENT
         run_as_group
 
         test from: :tls_version_test do
@@ -129,7 +128,7 @@ module DaVinciDTRTestKit
       end
 
       group from: :dtr_smart_ehr_launch,
-            required_suite_options: DTROptions::SMART_2_REQUIREMENT,
+            required_suite_options: DTRLightEHROptions::SMART_2_REQUIREMENT,
             run_as_group: true,
             config: {
               outputs: {

data/lib/davinci_dtr_test_kit/{client_groups/light_ehr → light_ehr/v2.0.1}/dtr_light_ehr_supported_endpoints_group.rb

@@ -1,8 +1,8 @@
-require_relative 'dtr_light_ehr_supported_payers_config_test'
-require_relative 'dtr_light_ehr_supported_payers_accept_header_test'
-require_relative 'dtr_light_ehr_supported_payers_endpoint_test'
-require_relative 'dtr_light_ehr_supported_payers_user_response_test'
-require_relative 'dtr_light_ehr_supported_payers_use_test'
+require_relative 'supported_endpoints/dtr_light_ehr_supported_payers_config_test'
+require_relative 'supported_endpoints/dtr_light_ehr_supported_payers_accept_header_test'
+require_relative 'supported_endpoints/dtr_light_ehr_supported_payers_endpoint_test'
+require_relative 'supported_endpoints/dtr_light_ehr_supported_payers_user_response_test'
+require_relative 'supported_endpoints/dtr_light_ehr_supported_payers_use_test'
 
 module DaVinciDTRTestKit
   class DTRLightEHRSupportedEndpointsGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/light_ehr → light_ehr/v2.0.1}/dtr_smart_ehr_launch.rb

@@ -1,6 +1,6 @@
-require_relative 'fhir_launch_context_test'
-require_relative 'fhir_context_coverage_test'
-require_relative 'fhir_context_references_test'
+require_relative 'smart_ehr_launch/fhir_launch_context_test'
+require_relative 'smart_ehr_launch/fhir_context_coverage_test'
+require_relative 'smart_ehr_launch/fhir_context_references_test'
 require 'smart_app_launch/ehr_launch_group_stu2'
 
 module DaVinciDTRTestKit