us_quality_core_test_kit 0.2.0 → 0.2.1

data/lib/us_quality_core_test_kit/client/generator/search_test_generator.rb

@@ -12,11 +12,10 @@ module USQualityCoreTestKit
           def generate(ig_metadata, base_output_dir)
             ig_metadata.groups
                        .reject { |group| USQualityCoreTestKit::Generator::SpecialCases.exclude_group? group }
-                       .select { |group| group.searches.present? }
+                       .select { |group| group.searches.any? { |search| search[:expectation] == 'SHALL' } }
                        .each do |group|
-              group.searches.each do |search|
-                new(group, search, base_output_dir).generate
-              end
+              first_required_search = group.searches.find { |search| search[:expectation] == 'SHALL' }
+              new(group, first_required_search, base_output_dir).generate
             end
           end
         end
@@ -30,7 +29,7 @@ module USQualityCoreTestKit
         end
 
         def class_name
-          "#{profile_identifier.camelize}#{search_identifier.camelize}ClientSearchTest"
+          "#{profile_identifier.camelize}ClientSearchTest"
         end
 
         def resource
@@ -46,21 +45,23 @@ module USQualityCoreTestKit
         end
 
         def title
-          "#{conformance_expectation} support #{search_param_name_string} search " \
-            "of #{profile_identifier.camelize}"
+          "Search #{resource_type} using a supported combination"
         end
 
         def description
-          "The client demonstrates #{conformance_expectation} support for searching " \
-            "#{search_param_name_string} on #{profile_identifier.camelize}."
+          "The client demonstrates at least one required server search combination for #{profile_identifier.camelize}."
         end
 
-        def all_required_search_parameters
+        def required_search_combinations
           group_metadata.searches
                         .select { |search| search[:expectation] == 'SHALL' }
-                        .flat_map { |search| search[:names] }
+                        .map { |search| search[:names] }
                         .uniq
         end
+
+        def all_required_search_parameters
+          required_search_combinations.flatten.uniq
+        end
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generator/suite_generator.rb

@@ -72,7 +72,7 @@ module USQualityCoreTestKit
             they demonstrate that the client:
 
             * Retrieved a target instance for each profile.
-            * Performed searches using the required search parameters and search
+            * Performed a search using at least one of the required server search
               parameter combinations for the profile's resource type.
 
             # Interpreting the Results
@@ -89,8 +89,8 @@ module USQualityCoreTestKit
               all profiles of that resource type will be evaluated, meaning that
               the group for each profile of that resource type will be executed,
               checking that the client read the target instance for that profile
-              and perform searches with all required search parameters and
-              combinations for the resource type. The executed group will pass or
+              and performed a search with at least one required server search
+              combination for the resource type. The executed group will pass or
               fail and include details of the issues encountered by Inferno.
             - If a client makes no requests for a given resource type, support
               is not evaluated. If support for the resource type is required, the

data/lib/us_quality_core_test_kit/client/generator/templates/read_test.rb.erb

@@ -4,8 +4,6 @@ module USQualityCoreTestKit
   module Client
     module <%= module_name %>
       class <%= class_name %> < Inferno::Test
-        include TestHelper
-
         id :<%= test_id %>
 
         title '<%= title %>'
@@ -14,20 +12,15 @@ module USQualityCoreTestKit
           <%= description %>
         )
 
+        optional <%= optional? %>
+
         def skip_message
           "Inferno did not receive any read requests for the `<%= resource_type %>` resource type."
         end
 
-        def failure_message
-          "Inferno did not receive the expected read request for the target instance of the <%= group_metadata.profile_name %>: <%= expected_resource_id_string %>."
-        end
-
         run do
           requests = load_tagged_requests(READ_<%= resource.underscore.upcase %>_TAG)
           skip_if requests.blank?, skip_message
-
-          requests_for_id = filter_requests_by_resource_id(requests, <%= expected_resource_id_literal %>)
-          assert requests_for_id.any?, failure_message
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generator/templates/search_test.rb.erb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# Only SHALL client searches are generated. SHOULD search tests may be added later.
 module USQualityCoreTestKit
   module Client
     module <%= module_name %>
@@ -12,41 +13,37 @@ module USQualityCoreTestKit
 
         description %(
           <%= description %>
+          Accepted combinations: <%= required_search_combinations.map { |names| "`#{names.join(' + ')}`" }.join(', ') %>.
         )
 
-        optional <%= optional? %>
-
-        def required_params
-          <%= search_metadata[:names] %>
+        def required_search_combinations
+          <%= required_search_combinations.inspect %>
         end
 
         def skip_message
-          "Inferno did not receive any search requests for the `<%= resource_type %>` resource type."
+          'Inferno did not receive any search requests for the `<%= resource_type %>` resource type.'
         end
 
         def failure_message
-          "Inferno did not receive the expected search made for the `<%= resource_type %>` resource type with required search parameters: `#{required_params.join(' + ')}`."
-        end
+          'Inferno did not receive a search for `<%= resource_type %>` using any of these combinations: ' \
+          "#{required_search_combinations.map { |names| names.join(' + ') }.join(', ')}."
+        end        
 
-        <%- unless optional? -%>
         def all_required_search_parameters
           <%= all_required_search_parameters.inspect %>
         end
 
-        <%- end -%>
         run do
           requests = load_tagged_requests(SEARCH_<%= resource.underscore.upcase %>_TAG)
           skip_if requests.blank?, skip_message
 
-          requests_with_params = filter_requests_by_search_parameters(requests, required_params)
-          assert requests_with_params.any?, failure_message
-          <%- unless optional? -%>
+          matching_requests = filter_requests_by_search_parameter_combinations(requests, required_search_combinations)
+          assert matching_requests.any?, failure_message
 
-          non_required_search_parameters(requests_with_params, all_required_search_parameters).each do |parameter|
+          non_required_search_parameters(matching_requests, all_required_search_parameters).each do |parameter|
             warning "The client used the non-required search parameter `#{parameter}` for `<%= resource_type %>`. " \
                     'The server may not accept search parameters other than those required by the IG CapabilityStatement.'
           end
-          <%- end -%>
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generator/wait_group_generator.rb

@@ -47,7 +47,7 @@ module USQualityCoreTestKit
             .map do |group|
               profile_name = USQualityCoreTestKit::Generator::Naming.upper_camel_case_for_profile(group)
               profile_header = "* **#{profile_name}**"
-              read_id = "  * read id:\n#{read_ids_for(group).map { |id| "    * #{id}" }.join("\n")}"
+              read_requirement = "  * read: any #{group.resource} resource (any ID)"
               required_searches = group.searches.each do |search|
                 next unless search[:expectation] == 'SHALL'
               end
@@ -55,21 +55,11 @@ module USQualityCoreTestKit
               search_list = required_searches.map do |search|
                 "    * #{search[:names].join(' + ')}"
               end
-              "#{profile_header}\n#{read_id}\n#{searches}\n#{search_list.join("\n")}"
+              "#{profile_header}\n#{read_requirement}\n#{searches}\n#{search_list.join("\n")}"
             end
             .join("\n")
         end
 
-        def read_ids_for(group)
-          naming = USQualityCoreTestKit::Generator::Naming
-          profile_identifier = naming.snake_case_for_profile(group)
-          read_ids = [naming.instance_id_for_profile(profile_identifier)]
-
-          read_ids << naming.instance_id_for_profile('observation_lab') if profile_identifier == 'observation_clinical_result'
-
-          read_ids
-        end
-
         def generate
           File.write(output_file_name, output)
         end

data/lib/us_quality_core_test_kit/client/test_helper.rb

@@ -17,12 +17,12 @@ module USQualityCoreTestKit
         end
       end
 
-      def filter_requests_by_search_parameters(requests, search_parameters)
+      def filter_requests_by_search_parameter_combinations(requests, combinations)
         requests.select do |request|
           included_params = search_parameters_for_request(request)
           next unless included_params.present?
 
-          search_parameters.all? { |param| included_params.include? param }
+          combinations.any? { |combination| combination.all? { |param| included_params.include? param } }
         end
       end
 

data/lib/us_quality_core_test_kit/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module USQualityCoreTestKit
-  VERSION = '0.2.0'
-  LAST_UPDATED = '2026-09-10'
+  VERSION = '0.2.1'
+  LAST_UPDATED = '2026-10-28'
 end