carin_for_blue_button_test_kit 0.9.1 → 0.10.0

data/lib/carin_for_blue_button_test_kit/generator/search_metadata_extractor.rb

@@ -59,8 +59,21 @@ module CarinForBlueButtonTestKit
           end
       end
 
+      def include_searches
+        resource_capabilities.searchInclude.map do |param|
+          begin
+            {
+              names: [param.sub("#{resource}:", "")],
+              expectation: 'SHALL',
+              include_search: true
+            }
+          end
+        end
+      end
+
       def search_param_names
-        searches.flat_map { |search| search[:names] }.uniq
+        searches_arr = searches + include_searches
+        searches_arr.flat_map { |search| search[:names] }.uniq
       end
 
       def search_definitions

data/lib/carin_for_blue_button_test_kit/generator/search_test_generator.rb

@@ -8,12 +8,13 @@ module CarinForBlueButtonTestKit
       class << self
         def generate(ig_metadata, base_output_dir)
           ig_metadata.groups
-            .reject { |group| SpecialCases.exclude_group? group }
-            .select { |group| group.searches.present? }
-            .each do |group|
-              group.searches.each { |search| new(group, search, base_output_dir).generate }
-              group.include_params.each{ |param| IncludeSearchTestGenerator.new(group, param, base_output_dir).generate }
+                     .select { |group| group.searches.present? }
+                     .each do |group|
+            group.searches.each { |search| new(group, search, base_output_dir).generate }
+            group.include_params.each do |param|
+              IncludeSearchTestGenerator.new(group, param, base_output_dir).generate
             end
+          end
         end
       end
 
@@ -34,7 +35,9 @@ module CarinForBlueButtonTestKit
       end
 
       def base_output_file_name
-        "#{class_name.underscore}.rb"
+        file_name = class_name.underscore
+        file_name.sub!("#{profile_identifier}_", '')
+        "#{file_name}.rb"
       end
 
       def output_file_directory
@@ -81,19 +84,30 @@ module CarinForBlueButtonTestKit
         @search_params ||=
           search_metadata[:names].map do |name|
             {
-              name: name,
+              name:,
               path: search_definition(name)[:path]
             }
           end
       end
 
+      def all_search_params
+        group_metadata.searches.map { |param| param[:names] }
+                      .flatten
+      end
+
       def first_search?
-        group_metadata.searches.first == search_metadata
+        # Mark patient the first search for EOB
+        if all_search_params.include?('patient')
+          search_param_name_string == 'patient'
+        else
+          group_metadata.searches.first == search_metadata
+        end
       end
 
       def fixed_value_search?
         first_search? && search_metadata[:names] != ['patient'] &&
-          !group_metadata.delayed? && resource_type != 'Patient'
+          search_metadata[:names] != ['_id'] && !group_metadata.delayed? &&
+          resource_type != 'Patient'
       end
 
       def fixed_value_search_param_name
@@ -122,11 +136,9 @@ module CarinForBlueButtonTestKit
       end
 
       def required_comparators_for_param(name)
-        begin
-            return search_definition(name)[:comparators].select { |_comparator, expectation| expectation == 'SHALL' }
-        rescue NoMethodError
-            return []
-        end
+        search_definition(name)[:comparators].select { |_comparator, expectation| expectation == 'SHALL' }
+      rescue NoMethodError
+        []
       end
 
       def required_comparators
@@ -150,14 +162,14 @@ module CarinForBlueButtonTestKit
       end
 
       def possible_status_search?
-        !search_metadata[:names].any? { |name| name.include? 'status' } &&
+        search_metadata[:names].none? { |name| name.include? 'status' } &&
           group_metadata.search_definitions.keys.any? { |key| key.to_s.include? 'status' }
       end
 
       def token_search_params
         @token_search_params ||=
           search_param_names.select do |name|
-            ['Identifier', 'CodeableConcept', 'Coding'].include? group_metadata.search_definitions[name.to_sym][:type]
+            %w[Identifier CodeableConcept Coding].include? group_metadata.search_definitions[name.to_sym][:type]
           end
       end
 
@@ -166,7 +178,7 @@ module CarinForBlueButtonTestKit
       end
 
       def required_multiple_or_search_params
-        @multiple_or_search_params ||=
+        @required_multiple_or_search_params ||=
           search_param_names.select do |name|
             search_definition(name)[:multiple_or] == 'SHALL'
           end
@@ -209,7 +221,10 @@ module CarinForBlueButtonTestKit
           properties[:token_search_params] = token_search_params_string if token_search_params.present?
           properties[:test_reference_variants] = 'true' if test_reference_variants?
           properties[:params_with_comparators] = required_comparators_string if required_comparators.present?
-          properties[:multiple_or_search_params] = required_multiple_or_search_params_string if required_multiple_or_search_params.present?
+          if required_multiple_or_search_params.present?
+            properties[:multiple_or_search_params] =
+              required_multiple_or_search_params_string
+          end
           properties[:test_post_search] = 'true' if first_search?
         end
       end
@@ -231,7 +246,7 @@ module CarinForBlueButtonTestKit
 
       def generate
         FileUtils.mkdir_p(output_file_directory)
-        File.open(output_file_name, 'w') { |f| f.write(output) }
+        File.write(output_file_name, output)
 
         group_metadata.add_test(
           id: test_id,
@@ -243,9 +258,9 @@ module CarinForBlueButtonTestKit
         return '' unless test_reference_variants?
 
         <<~REFERENCE_SEARCH_DESCRIPTION
-        This test verifies that the server supports searching by reference using
-        the form `patient=[id]` as well as `patient=Patient/[id]`. The two
-        different forms are expected to return the same number of results. CARIN requires that both forms are supported by CARIN for Blue Button responders.
+          This test verifies that the server supports searching by reference using
+          the form `patient=[id]` as well as `patient=Patient/[id]`. The two
+          different forms are expected to return the same number of results. CARIN requires that both forms are supported by CARIN for Blue Button responders.
         REFERENCE_SEARCH_DESCRIPTION
       end
 
@@ -253,8 +268,8 @@ module CarinForBlueButtonTestKit
         return '' unless first_search?
 
         <<~FIRST_SEARCH_DESCRIPTION
-        Because this is the first search of the sequence, resources in the
-        response will be used for subsequent tests.
+          Because this is the first search of the sequence, resources in the
+          response will be used for subsequent tests.
         FIRST_SEARCH_DESCRIPTION
       end
 
@@ -262,36 +277,63 @@ module CarinForBlueButtonTestKit
         return '' unless test_post_search?
 
         <<~POST_SEARCH_DESCRIPTION
-        Additionally, this test will check that GET and POST search methods
-        return the same number of results. Search by POST is required by the
-        FHIR R4 specification, and these tests interpret search by GET as a
-        requirement of CARIN IG for Blue Button® #{group_metadata.version}.
+          Additionally, this test will check that GET and POST search methods
+          return the same number of results. Search by POST is required by the
+          FHIR R4 specification, and these tests interpret search by GET as a
+          requirement of CARIN IG for Blue Button® #{group_metadata.version}.
         POST_SEARCH_DESCRIPTION
       end
 
       def description
         <<~DESCRIPTION.gsub(/\n{3,}/, "\n\n")
-        A server #{conformance_expectation} support searching by
-        #{search_param_name_string} on the #{resource_type} resource. This test
-        will pass if resources are returned and match the search criteria. If
-        none are returned, the test is skipped.
+          A server #{conformance_expectation} support searching by
+          #{search_param_name_string} on the #{resource_type} resource. This test
+          will pass if resources are returned and match the search criteria. If
+          none are returned, the test is skipped.
 
-        #{reference_search_description}
-        #{first_search_description}
-        #{post_search_description}
+          #{reference_search_description}
+          #{first_search_description}
+          #{post_search_description}
 
         DESCRIPTION
       end
 
+      def input_id
+        needs_patient_id? ? 'patient_ids' : "#{test_id}_param"
+      end
+
       def input_title
+        title_content = if needs_patient_id?
+                          'Patient IDs'
+                        else
+                          "#{resource_type} search parameter for #{search_param_name_string}"
+                        end
+
         <<~INPUT_TITLE
-        #{resource_type} search parameter for #{search_param_name_string}
+          #{title_content.strip}
         INPUT_TITLE
       end
 
       def input_description
+        desc_content = if needs_patient_id?
+                         "
+                          Comma separated list of patient IDs that in sum
+                          contain all MUST SUPPORT elements
+                          "
+                       else
+                         "
+                          This input is optional. If running all tests, the search will look for
+                          its parameter values from the results returned in the EOB tests. If no
+                          #{resource_type} resource was returned in previous EOB tests and this
+                          input is not provided, the search is skipped.
+
+                          When running just the #{resource_type} Test group, this input is
+                          required to perform the search, otherwise the search is skipped.
+                          "
+                       end
+
         <<~INPUT_DESCRIPTION
-        #{resource_type} search parameter: #{search_param_name_string}
+          #{desc_content}
         INPUT_DESCRIPTION
       end
     end

data/lib/carin_for_blue_button_test_kit/generator/special_cases.rb

@@ -2,10 +2,6 @@ module CarinForBlueButtonTestKit
     class Generator
       module SpecialCases
         RESOURCES_TO_EXCLUDE = [
-          'Patient',
-          'Organization',
-          'Practitioner',
-          'RelatedPerson'
         ].freeze
   
         PROFILES_TO_EXCLUDE = [

data/lib/carin_for_blue_button_test_kit/generator/suite_generator.rb

@@ -29,7 +29,7 @@ module CarinForBlueButtonTestKit
       end
 
       def class_name
-        "C4BBTestKit"
+        "C4BBTestSuite"
       end
 
       def module_name
@@ -68,7 +68,7 @@ module CarinForBlueButtonTestKit
       end
 
       def groups
-        ig_metadata.ordered_groups
+        ig_metadata.ordered_groups.select { |group| group.id.present? }
       end
 
       def group_id_list
@@ -89,6 +89,13 @@ module CarinForBlueButtonTestKit
         "c4bb_#{ig_metadata.reformatted_version}_capability_statement"
       end
 
+      def smart_launch_file_name
+        "../../custom_groups/#{ig_metadata.ig_version}/c4bb_smart_launch_group"
+      end
+
+      def smart_launch_group_id
+        "c4bb_#{ig_metadata.reformatted_version}_smart_launch"
+      end
     end
   end
 end

data/lib/carin_for_blue_button_test_kit/generator/validation_test_generator.rb

@@ -29,7 +29,9 @@ module CarinForBlueButtonTestKit
       end
 
       def base_output_file_name
-        "#{class_name.underscore}.rb"
+        file_name = class_name.underscore
+        file_name.sub!("#{profile_identifier}_", '')
+        "#{file_name}.rb"
       end
 
       def output_file_directory
@@ -82,15 +84,15 @@ module CarinForBlueButtonTestKit
 
       def specific_resource_type
         case profile_identifier
-        when 'explanation_of_benefit_inpatient_institutional'
+        when 'eob_inpatient_institutional'
           return "ExplanationOfBenefitInpatientInstitutional"
-        when 'explanation_of_benefit_oral'
+        when 'eob_oral'
           return "ExplanationOfBenefitOral"
-        when 'explanation_of_benefit_outpatient_institutional'
+        when 'eob_outpatient_institutional'
           return "ExplanationOfBenefitOutpatientInstitutional"
-        when 'explanation_of_benefit_pharmacy'
+        when 'eob_pharmacy'
           return "ExplanationOfBenefitPharmacy"
-        when 'explanation_of_benefit_professional_non_clinician'
+        when 'eob_professional_non_clinician'
           return "ExplanationOfBenefitProfessionalNonClinician"
         else
           return self.resource_type

data/lib/carin_for_blue_button_test_kit/generator.rb

@@ -31,10 +31,10 @@ module CarinForBlueButtonTestKit
             load_ig_package
             extract_metadata
             generate_resource_list
+            generate_search_tests
             generate_read_tests
             generate_validation_tests
             generate_must_support_tests
-            generate_search_tests
 
             generate_groups
             generate_suites
@@ -47,11 +47,9 @@ module CarinForBlueButtonTestKit
 
         def extract_metadata
             self.ig_metadata = IGMetadataExtractor.new(ig_resources).extract
-      
+
             FileUtils.mkdir_p(base_output_dir)
-            File.open(File.join(base_output_dir, 'metadata.yml'), 'w') do |file|
-              file.write(YAML.dump(ig_metadata.to_hash))
-            end
+            File.write(File.join(base_output_dir, 'metadata.yml'), YAML.dump(ig_metadata.to_hash))
         end
 
         def base_output_dir
@@ -61,7 +59,7 @@ module CarinForBlueButtonTestKit
         def generate_resource_list
             ResourceListGenerator.generate(ig_metadata, base_output_dir)
         end
-        
+
         def generate_validation_tests
             ValidationTestGenerator.generate(ig_metadata, base_output_dir)
         end
@@ -85,6 +83,5 @@ module CarinForBlueButtonTestKit
         def generate_search_tests
             SearchTestGenerator.generate(ig_metadata, base_output_dir)
         end
-      
     end
 end

data/lib/carin_for_blue_button_test_kit/igs/carin4bb-110/SearchParameter-Resource-id.json

@@ -0,0 +1 @@
+{"resourceType":"SearchParameter","id":"Resource-id","extension":[{"url":"http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status","valueCode":"trial-use"}],"url":"http://hl7.org/fhir/SearchParameter/Resource-id","version":"4.0.1","name":"_id","status":"draft","experimental":false,"date":"2019-11-01T09:29:23+11:00","publisher":"Health Level Seven International (FHIR Infrastructure)","contact":[{"telecom":[{"system":"url","value":"http://hl7.org/fhir"}]},{"telecom":[{"system":"url","value":"http://www.hl7.org/Special/committees/fiwg/index.cfm"}]}],"description":"Logical id of this artifact","code":"_id","base":["Resource"],"type":"token","expression":"Resource.id","xpath":"f:Resource/f:id","xpathUsage":"normal"}

data/lib/carin_for_blue_button_test_kit/igs/carin4bb-110/SearchParameter-Resource-lastUpdated.json

@@ -0,0 +1 @@
+{"resourceType":"SearchParameter","id":"Resource-lastUpdated","extension":[{"url":"http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status","valueCode":"trial-use"}],"url":"http://hl7.org/fhir/SearchParameter/Resource-lastUpdated","version":"4.0.1","name":"_lastUpdated","status":"draft","experimental":false,"date":"2019-11-01T09:29:23+11:00","publisher":"Health Level Seven International (FHIR Infrastructure)","contact":[{"telecom":[{"system":"url","value":"http://hl7.org/fhir"}]},{"telecom":[{"system":"url","value":"http://www.hl7.org/Special/committees/fiwg/index.cfm"}]}],"description":"When the resource version last changed","code":"_lastUpdated","base":["Resource"],"type":"date","expression":"Resource.meta.lastUpdated","xpath":"f:Resource/f:meta/f:lastUpdated","xpathUsage":"normal","comparator":["eq","ne","gt","ge","lt","le","sa","eb","ap"]}

data/lib/carin_for_blue_button_test_kit/igs/carin4bb-200/SearchParameter-Resource-id.json

@@ -0,0 +1 @@
+{"resourceType":"SearchParameter","id":"Resource-id","extension":[{"url":"http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status","valueCode":"trial-use"}],"url":"http://hl7.org/fhir/SearchParameter/Resource-id","version":"4.0.1","name":"_id","status":"draft","experimental":false,"date":"2019-11-01T09:29:23+11:00","publisher":"Health Level Seven International (FHIR Infrastructure)","contact":[{"telecom":[{"system":"url","value":"http://hl7.org/fhir"}]},{"telecom":[{"system":"url","value":"http://www.hl7.org/Special/committees/fiwg/index.cfm"}]}],"description":"Logical id of this artifact","code":"_id","base":["Resource"],"type":"token","expression":"Resource.id","xpath":"f:Resource/f:id","xpathUsage":"normal"}

data/lib/carin_for_blue_button_test_kit/igs/carin4bb-200/SearchParameter-Resource-lastUpdated.json

@@ -0,0 +1 @@
+{"resourceType":"SearchParameter","id":"Resource-lastUpdated","extension":[{"url":"http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status","valueCode":"trial-use"}],"url":"http://hl7.org/fhir/SearchParameter/Resource-lastUpdated","version":"4.0.1","name":"_lastUpdated","status":"draft","experimental":false,"date":"2019-11-01T09:29:23+11:00","publisher":"Health Level Seven International (FHIR Infrastructure)","contact":[{"telecom":[{"system":"url","value":"http://hl7.org/fhir"}]},{"telecom":[{"system":"url","value":"http://www.hl7.org/Special/committees/fiwg/index.cfm"}]}],"description":"When the resource version last changed","code":"_lastUpdated","base":["Resource"],"type":"date","expression":"Resource.meta.lastUpdated","xpath":"f:Resource/f:meta/f:lastUpdated","xpathUsage":"normal","comparator":["eq","ne","gt","ge","lt","le","sa","eb","ap"]}

data/lib/carin_for_blue_button_test_kit/igs/carin4bb-200-dev-nonfinancial-fixed/SearchParameter-Resource-id.json

@@ -0,0 +1 @@
+{"resourceType":"SearchParameter","id":"Resource-id","extension":[{"url":"http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status","valueCode":"trial-use"}],"url":"http://hl7.org/fhir/SearchParameter/Resource-id","version":"4.0.1","name":"_id","status":"draft","experimental":false,"date":"2019-11-01T09:29:23+11:00","publisher":"Health Level Seven International (FHIR Infrastructure)","contact":[{"telecom":[{"system":"url","value":"http://hl7.org/fhir"}]},{"telecom":[{"system":"url","value":"http://www.hl7.org/Special/committees/fiwg/index.cfm"}]}],"description":"Logical id of this artifact","code":"_id","base":["Resource"],"type":"token","expression":"Resource.id","xpath":"f:Resource/f:id","xpathUsage":"normal"}

data/lib/carin_for_blue_button_test_kit/igs/carin4bb-200-dev-nonfinancial-fixed/SearchParameter-Resource-lastUpdated.json

@@ -0,0 +1 @@
+{"resourceType":"SearchParameter","id":"Resource-lastUpdated","extension":[{"url":"http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status","valueCode":"trial-use"}],"url":"http://hl7.org/fhir/SearchParameter/Resource-lastUpdated","version":"4.0.1","name":"_lastUpdated","status":"draft","experimental":false,"date":"2019-11-01T09:29:23+11:00","publisher":"Health Level Seven International (FHIR Infrastructure)","contact":[{"telecom":[{"system":"url","value":"http://hl7.org/fhir"}]},{"telecom":[{"system":"url","value":"http://www.hl7.org/Special/committees/fiwg/index.cfm"}]}],"description":"When the resource version last changed","code":"_lastUpdated","base":["Resource"],"type":"date","expression":"Resource.meta.lastUpdated","xpath":"f:Resource/f:meta/f:lastUpdated","xpathUsage":"normal","comparator":["eq","ne","gt","ge","lt","le","sa","eb","ap"]}

data/lib/carin_for_blue_button_test_kit/must_support_test.rb

@@ -102,12 +102,12 @@ module CarinForBlueButtonTestKit
         must_support_elements.select do |element_definition|
           resources.none? do |resource|
             path = element_definition[:path] #.delete_suffix('[x]')
-            value_found = find_a_value_at(resource.source_hash, path) do |value|
+            value_found = find_a_value_at(resource, path) do |value|
               value_without_extensions =
                 value.respond_to?(:to_hash) ? value.to_hash.reject { |key, _| key == 'extension' } : value
 
               (value_without_extensions.present? || value_without_extensions == false) &&
-                (element_definition[:fixed_value].blank? || value == element_definition[:fixed_value])
+                (element_definition[:fixed_value].blank? || value.try(:source_hash) == element_definition[:fixed_value] || value == element_definition[:fixed_value])
 
             end
 
@@ -132,7 +132,7 @@ module CarinForBlueButtonTestKit
         must_support_slices.select do |slice|
           resources.none? do |resource|
             path = slice[:path] # .delete_suffix('[x]')
-            find_slice(resource.source_hash, path, slice[:discriminator]).present?
+            find_slice(resource, path, slice[:discriminator]).present?
           end
         end
     end
@@ -143,15 +143,15 @@ module CarinForBlueButtonTestKit
         when 'patternCodeableConcept'
           coding_path = discriminator[:path].present? ? "#{discriminator[:path]}.coding" : 'coding'
           find_a_value_at(element, coding_path) do |coding|
-            coding[:code.to_s] == discriminator[:code] && coding[:system.to_s] == discriminator[:system]
+            coding.code == discriminator[:code] && coding.system == discriminator[:system]
           end
         when 'patternCoding'
           coding_path = discriminator[:path].present? ? discriminator[:path] : ''
           find_a_value_at(element, coding_path) do |coding|
-            coding[:code.to_s] == discriminator[:code] && coding[:system.to_s] == discriminator[:system]
+            coding.code == discriminator[:code] && coding.system == discriminator[:system]
           end
         when 'patternIdentifier'
-          find_a_value_at(element, discriminator[:path]) { |identifier| identifier[:system.to_s] == discriminator[:system] }
+          find_a_value_at(element, discriminator[:path]) { |identifier| identifier.system == discriminator[:system] }
         when 'value'
           values = discriminator[:values].map { |value| value.merge(path: value[:path].split('.')) }
           find_slice_by_values(element, values)
@@ -176,7 +176,7 @@ module CarinForBlueButtonTestKit
           end
         when 'requiredBinding'
           coding_path = discriminator[:path].present? ? "#{discriminator[:path]}.coding" : 'coding'
-          find_a_value_at(element, coding_path) {|coding| discriminator[:values].include?(coding[:code.to_s]) }
+          find_a_value_at(element, coding_path) {|coding| discriminator[:values].include?(coding.code) }
         end
       end
     end

data/lib/carin_for_blue_button_test_kit/read_test.rb

@@ -1,51 +1,62 @@
 module CarinForBlueButtonTestKit
-    module ReadTest
-      def all_scratch_resources
-        scratch_resources[:all] ||= []
-      end
-  
-      def perform_read_test(resources, reply_handler = nil)
-        skip_if resources.blank?, no_resources_skip_message
-  
-        if config.options[:read_all_resources]
-          resources.each do |id|
-            fhir_read(resource_type, id)
-            read_and_validate(resource)
-          end
-        else
-          fhir_read(resource_type, resources.first)
-          read_and_validate(resource)
-        end
+  module ReadTest
+    def all_scratch_resources
+      scratch_resources[:all] ||= []
+    end
+
+    def perform_read_test(resources, _reply_handler = nil)
+      skip_if resources.blank? && resource_ids.blank?, no_resources_skip_message
+      resources_to_read_ids = resource_ids
+      if resources_to_read_ids.blank?
+        resources_to_read = readable_resources(resources)
+
+        assert resources_to_read.present?, "No #{resource_type} id found."
+        resources_to_read_ids = resources_to_read.map { |resource| resource_id(resource) }
       end
-  
-      def read_and_validate(resource_to_read)
-        id = resource_id(resource_to_read)
-
-        assert_response_status(200) 
-        assert_resource_type(resource_type, resource: resource_to_read)
-        assert resource.id.present? && resource.id == id, bad_resource_id_message(id)
-  
-        if resource_to_read.is_a?(FHIR::Model)
-          all_scratch_resources << resource
+
+      if config.options[:read_all_resources]
+        resources_to_read_ids.each do |id|
+          read_and_validate(id)
         end
+      else
+        read_and_validate(resources_to_read_ids.first)
       end
-  
-      def resource_id(resource)
-        resource.is_a?(FHIR::Reference) ? resource.reference.split('/').last : resource.id
-      end
-  
-      def no_resources_skip_message
-        "No #{resource_type} resources appear to be available. " \
-        'Please use patients with more information.'
-      end
-  
-      def bad_resource_id_message(expected_id)
-        "Expected resource to have id: `#{expected_id.inspect}`, but found `#{resource.id.inspect}`"
-      end
-  
-      def resource_class
-        FHIR.const_get(resource_type)
-      end
+    end
+
+    def readable_resources(resources)
+      resources
+        .select { |resource| resource.is_a?(resource_class) || resource.is_a?(FHIR::Reference) }
+        .select { |resource| (resource.is_a?(FHIR::Reference) ? resource.reference.split('/').last : resource.id).present? }
+        .compact
+        .uniq { |resource| resource.is_a?(FHIR::Reference) ? resource.reference.split('/').last : resource.id }
+    end
+
+    def read_and_validate(id)
+      fhir_read resource_type, id
+
+      assert_response_status(200)
+      assert_resource_type(resource_type)
+      assert resource.id.present? && resource.id == id, bad_resource_id_message(id)
+
+      all_scratch_resources << resource
+      all_scratch_resources.uniq!
+    end
+
+    def resource_id(resource)
+      resource.is_a?(FHIR::Reference) ? resource.reference.split('/').last : resource.id
+    end
+
+    def no_resources_skip_message
+      "No #{resource_type} resources appear to be available. " \
+      'Please use patients with more information.'
+    end
+
+    def bad_resource_id_message(expected_id)
+      "Expected resource to have id: `#{expected_id.inspect}`, but found `#{resource.id.inspect}`"
+    end
+
+    def resource_class
+      FHIR.const_get(resource_type)
     end
   end
-  
+end

data/lib/carin_for_blue_button_test_kit/search_test_properties.rb

@@ -12,7 +12,8 @@ module CarinForBlueButtonTestKit
         :test_reference_variants,
         :params_with_comparators,
         :multiple_or_search_params,
-        :test_post_search
+        :test_post_search,
+        :include_parameters
       ].freeze
   
       ATTRIBUTES.each { |name| attr_reader name }

data/lib/carin_for_blue_button_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CarinForBlueButtonTestKit
-    VERSION = '0.9.1'
+    VERSION = '0.10.0'
 end

data/lib/carin_for_blue_button_test_kit.rb

@@ -1,2 +1,3 @@
 require_relative 'carin_for_blue_button_test_kit/generated/v1.1.0/c4bb_test_suite'
 require_relative 'carin_for_blue_button_test_kit/generated/v2.0.0/c4bb_test_suite'
+require_relative 'carin_for_blue_button_test_kit/generated/v2.0.0-dev-nonfinancial/c4bb_test_suite'