us_quality_core_test_kit 0.2.0 → 0.2.1

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_observation_occupation_client_group.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'us_core_observation_occupation/us_core_observation_occupation_client_read_test'
-require_relative 'us_core_observation_occupation/us_core_observation_occupation_patient_code_client_search_test'
-require_relative 'us_core_observation_occupation/us_core_observation_occupation_patient_category_status_client_search_test'
-require_relative 'us_core_observation_occupation/us_core_observation_occupation_patient_category_client_search_test'
-require_relative 'us_core_observation_occupation/us_core_observation_occupation_patient_category_date_client_search_test'
+require_relative 'us_core_observation_occupation/us_core_observation_occupation_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -26,29 +23,23 @@ conforming to the US Core Observation Occupation Profile.
 ## Data Access Supported
 
 Clients may not be required to support the Observation FHIR resource type. However, if they
-do support it, they must support the US Core Observation Occupation Profile and the resource type's search parameters.
+do support it, they must support the US Core Observation Occupation Profile and use a supported search to access its data.
 The tests in this group will not execute if client makes no attempt to access data for the
 Observation resource type. In this case, the test will be marked as skip if support
 for the resource type is required, and omitted otherwise.
 
 ## Reading
-This test will check that the client performed a read of the following id:
-
-* `usqualitycore-us-core-observation-occupation`
+This test checks that the client performed a read of any Observation resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-Observation resource type with the following required parameters:
+The client must demonstrate at least one of the following search parameter
+combinations supported by the server for Observation:
 
 * patient + code
 * patient + category + status
 * patient + category
 * patient + category + date
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -57,10 +48,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_us_core_observation_occupation_client_read_test
-        test from: :us_quality_core_v050_us_core_observation_occupation_patient_code_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_occupation_patient_category_status_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_occupation_patient_category_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_occupation_patient_category_date_client_search_test
+        test from: :us_quality_core_v050_us_core_observation_occupation_client_search_test
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_observation_pregnancyintent/us_core_observation_pregnancyintent_client_read_test.rb

@@ -4,30 +4,23 @@ module USQualityCoreTestKit
   module Client
     module USQualityCoreClientV050
       class UsCoreObservationPregnancyintentClientReadTest < Inferno::Test
-        include TestHelper
-
         id :us_quality_core_v050_us_core_observation_pregnancyintent_client_read_test
 
-        title 'SHALL support read of UsCoreObservationPregnancyintent'
+        title 'SHALL support read of Observation'
 
         description %(
-          The client demonstrates SHALL support for reading UsCoreObservationPregnancyintent.
+          The client demonstrates SHALL support for reading the Observation resource type.
         )
 
+        optional true
+
         def skip_message
           "Inferno did not receive any read requests for the `Observation` resource type."
         end
 
-        def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Core Observation Pregnancy Intent Profile: `Observation/usqualitycore-us-core-observation-pregnancyintent`."
-        end
-
         run do
           requests = load_tagged_requests(READ_OBSERVATION_TAG)
           skip_if requests.blank?, skip_message
-
-          requests_for_id = filter_requests_by_resource_id(requests, 'usqualitycore-us-core-observation-pregnancyintent')
-          assert requests_for_id.any?, failure_message
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_observation_pregnancyintent/us_core_observation_pregnancyintent_client_search_test.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Only SHALL client searches are generated. SHOULD search tests may be added later.
+module USQualityCoreTestKit
+  module Client
+    module USQualityCoreClientV050
+      class UsCoreObservationPregnancyintentClientSearchTest < Inferno::Test
+        include TestHelper
+
+        id :us_quality_core_v050_us_core_observation_pregnancyintent_client_search_test
+
+        title 'Search Observation using a supported combination'
+
+        description %(
+          The client demonstrates at least one required server search combination for UsCoreObservationPregnancyintent.
+          Accepted combinations: `patient + code`, `patient + category + status`, `patient + category`, `patient + category + date`.
+        )
+
+        def required_search_combinations
+          [["patient", "code"], ["patient", "category", "status"], ["patient", "category"], ["patient", "category", "date"]]
+        end
+
+        def skip_message
+          'Inferno did not receive any search requests for the `Observation` resource type.'
+        end
+
+        def failure_message
+          'Inferno did not receive a search for `Observation` using any of these combinations: ' \
+          "#{required_search_combinations.map { |names| names.join(' + ') }.join(', ')}."
+        end        
+
+        def all_required_search_parameters
+          ["patient", "code", "category", "status", "date"]
+        end
+
+        run do
+          requests = load_tagged_requests(SEARCH_OBSERVATION_TAG)
+          skip_if requests.blank?, skip_message
+
+          matching_requests = filter_requests_by_search_parameter_combinations(requests, required_search_combinations)
+          assert matching_requests.any?, failure_message
+
+          non_required_search_parameters(matching_requests, all_required_search_parameters).each do |parameter|
+            warning "The client used the non-required search parameter `#{parameter}` for `Observation`. " \
+                    'The server may not accept search parameters other than those required by the IG CapabilityStatement.'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_observation_pregnancyintent_client_group.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'us_core_observation_pregnancyintent/us_core_observation_pregnancyintent_client_read_test'
-require_relative 'us_core_observation_pregnancyintent/us_core_observation_pregnancyintent_patient_code_client_search_test'
-require_relative 'us_core_observation_pregnancyintent/us_core_observation_pregnancyintent_patient_category_status_client_search_test'
-require_relative 'us_core_observation_pregnancyintent/us_core_observation_pregnancyintent_patient_category_client_search_test'
-require_relative 'us_core_observation_pregnancyintent/us_core_observation_pregnancyintent_patient_category_date_client_search_test'
+require_relative 'us_core_observation_pregnancyintent/us_core_observation_pregnancyintent_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -26,29 +23,23 @@ conforming to the US Core Observation Pregnancy Intent Profile.
 ## Data Access Supported
 
 Clients may not be required to support the Observation FHIR resource type. However, if they
-do support it, they must support the US Core Observation Pregnancy Intent Profile and the resource type's search parameters.
+do support it, they must support the US Core Observation Pregnancy Intent Profile and use a supported search to access its data.
 The tests in this group will not execute if client makes no attempt to access data for the
 Observation resource type. In this case, the test will be marked as skip if support
 for the resource type is required, and omitted otherwise.
 
 ## Reading
-This test will check that the client performed a read of the following id:
-
-* `usqualitycore-us-core-observation-pregnancyintent`
+This test checks that the client performed a read of any Observation resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-Observation resource type with the following required parameters:
+The client must demonstrate at least one of the following search parameter
+combinations supported by the server for Observation:
 
 * patient + code
 * patient + category + status
 * patient + category
 * patient + category + date
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -57,10 +48,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_us_core_observation_pregnancyintent_client_read_test
-        test from: :us_quality_core_v050_us_core_observation_pregnancyintent_patient_code_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_pregnancyintent_patient_category_status_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_pregnancyintent_patient_category_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_pregnancyintent_patient_category_date_client_search_test
+        test from: :us_quality_core_v050_us_core_observation_pregnancyintent_client_search_test
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_observation_pregnancystatus/us_core_observation_pregnancystatus_client_read_test.rb

@@ -4,30 +4,23 @@ module USQualityCoreTestKit
   module Client
     module USQualityCoreClientV050
       class UsCoreObservationPregnancystatusClientReadTest < Inferno::Test
-        include TestHelper
-
         id :us_quality_core_v050_us_core_observation_pregnancystatus_client_read_test
 
-        title 'SHALL support read of UsCoreObservationPregnancystatus'
+        title 'SHALL support read of Observation'
 
         description %(
-          The client demonstrates SHALL support for reading UsCoreObservationPregnancystatus.
+          The client demonstrates SHALL support for reading the Observation resource type.
         )
 
+        optional true
+
         def skip_message
           "Inferno did not receive any read requests for the `Observation` resource type."
         end
 
-        def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Core Observation Pregnancy Status Profile: `Observation/usqualitycore-us-core-observation-pregnancystatus`."
-        end
-
         run do
           requests = load_tagged_requests(READ_OBSERVATION_TAG)
           skip_if requests.blank?, skip_message
-
-          requests_for_id = filter_requests_by_resource_id(requests, 'usqualitycore-us-core-observation-pregnancystatus')
-          assert requests_for_id.any?, failure_message
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_observation_pregnancystatus/us_core_observation_pregnancystatus_client_search_test.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Only SHALL client searches are generated. SHOULD search tests may be added later.
+module USQualityCoreTestKit
+  module Client
+    module USQualityCoreClientV050
+      class UsCoreObservationPregnancystatusClientSearchTest < Inferno::Test
+        include TestHelper
+
+        id :us_quality_core_v050_us_core_observation_pregnancystatus_client_search_test
+
+        title 'Search Observation using a supported combination'
+
+        description %(
+          The client demonstrates at least one required server search combination for UsCoreObservationPregnancystatus.
+          Accepted combinations: `patient + code`, `patient + category + status`, `patient + category`, `patient + category + date`.
+        )
+
+        def required_search_combinations
+          [["patient", "code"], ["patient", "category", "status"], ["patient", "category"], ["patient", "category", "date"]]
+        end
+
+        def skip_message
+          'Inferno did not receive any search requests for the `Observation` resource type.'
+        end
+
+        def failure_message
+          'Inferno did not receive a search for `Observation` using any of these combinations: ' \
+          "#{required_search_combinations.map { |names| names.join(' + ') }.join(', ')}."
+        end        
+
+        def all_required_search_parameters
+          ["patient", "code", "category", "status", "date"]
+        end
+
+        run do
+          requests = load_tagged_requests(SEARCH_OBSERVATION_TAG)
+          skip_if requests.blank?, skip_message
+
+          matching_requests = filter_requests_by_search_parameter_combinations(requests, required_search_combinations)
+          assert matching_requests.any?, failure_message
+
+          non_required_search_parameters(matching_requests, all_required_search_parameters).each do |parameter|
+            warning "The client used the non-required search parameter `#{parameter}` for `Observation`. " \
+                    'The server may not accept search parameters other than those required by the IG CapabilityStatement.'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_observation_pregnancystatus_client_group.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'us_core_observation_pregnancystatus/us_core_observation_pregnancystatus_client_read_test'
-require_relative 'us_core_observation_pregnancystatus/us_core_observation_pregnancystatus_patient_code_client_search_test'
-require_relative 'us_core_observation_pregnancystatus/us_core_observation_pregnancystatus_patient_category_status_client_search_test'
-require_relative 'us_core_observation_pregnancystatus/us_core_observation_pregnancystatus_patient_category_client_search_test'
-require_relative 'us_core_observation_pregnancystatus/us_core_observation_pregnancystatus_patient_category_date_client_search_test'
+require_relative 'us_core_observation_pregnancystatus/us_core_observation_pregnancystatus_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -26,29 +23,23 @@ conforming to the US Core Observation Pregnancy Status Profile.
 ## Data Access Supported
 
 Clients may not be required to support the Observation FHIR resource type. However, if they
-do support it, they must support the US Core Observation Pregnancy Status Profile and the resource type's search parameters.
+do support it, they must support the US Core Observation Pregnancy Status Profile and use a supported search to access its data.
 The tests in this group will not execute if client makes no attempt to access data for the
 Observation resource type. In this case, the test will be marked as skip if support
 for the resource type is required, and omitted otherwise.
 
 ## Reading
-This test will check that the client performed a read of the following id:
-
-* `usqualitycore-us-core-observation-pregnancystatus`
+This test checks that the client performed a read of any Observation resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-Observation resource type with the following required parameters:
+The client must demonstrate at least one of the following search parameter
+combinations supported by the server for Observation:
 
 * patient + code
 * patient + category + status
 * patient + category
 * patient + category + date
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -57,10 +48,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_us_core_observation_pregnancystatus_client_read_test
-        test from: :us_quality_core_v050_us_core_observation_pregnancystatus_patient_code_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_pregnancystatus_patient_category_status_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_pregnancystatus_patient_category_client_search_test
-        test from: :us_quality_core_v050_us_core_observation_pregnancystatus_patient_category_date_client_search_test
+        test from: :us_quality_core_v050_us_core_observation_pregnancystatus_client_search_test
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_pulse_oximetry/us_core_pulse_oximetry_client_read_test.rb

@@ -4,30 +4,23 @@ module USQualityCoreTestKit
   module Client
     module USQualityCoreClientV050
       class UsCorePulseOximetryClientReadTest < Inferno::Test
-        include TestHelper
-
         id :us_quality_core_v050_us_core_pulse_oximetry_client_read_test
 
-        title 'SHALL support read of UsCorePulseOximetry'
+        title 'SHALL support read of Observation'
 
         description %(
-          The client demonstrates SHALL support for reading UsCorePulseOximetry.
+          The client demonstrates SHALL support for reading the Observation resource type.
         )
 
+        optional true
+
         def skip_message
           "Inferno did not receive any read requests for the `Observation` resource type."
         end
 
-        def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Core Pulse Oximetry Profile: `Observation/usqualitycore-us-core-pulse-oximetry`."
-        end
-
         run do
           requests = load_tagged_requests(READ_OBSERVATION_TAG)
           skip_if requests.blank?, skip_message
-
-          requests_for_id = filter_requests_by_resource_id(requests, 'usqualitycore-us-core-pulse-oximetry')
-          assert requests_for_id.any?, failure_message
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_pulse_oximetry/us_core_pulse_oximetry_client_search_test.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Only SHALL client searches are generated. SHOULD search tests may be added later.
+module USQualityCoreTestKit
+  module Client
+    module USQualityCoreClientV050
+      class UsCorePulseOximetryClientSearchTest < Inferno::Test
+        include TestHelper
+
+        id :us_quality_core_v050_us_core_pulse_oximetry_client_search_test
+
+        title 'Search Observation using a supported combination'
+
+        description %(
+          The client demonstrates at least one required server search combination for UsCorePulseOximetry.
+          Accepted combinations: `patient + code`, `patient + category + status`, `patient + category`, `patient + category + date`.
+        )
+
+        def required_search_combinations
+          [["patient", "code"], ["patient", "category", "status"], ["patient", "category"], ["patient", "category", "date"]]
+        end
+
+        def skip_message
+          'Inferno did not receive any search requests for the `Observation` resource type.'
+        end
+
+        def failure_message
+          'Inferno did not receive a search for `Observation` using any of these combinations: ' \
+          "#{required_search_combinations.map { |names| names.join(' + ') }.join(', ')}."
+        end        
+
+        def all_required_search_parameters
+          ["patient", "code", "category", "status", "date"]
+        end
+
+        run do
+          requests = load_tagged_requests(SEARCH_OBSERVATION_TAG)
+          skip_if requests.blank?, skip_message
+
+          matching_requests = filter_requests_by_search_parameter_combinations(requests, required_search_combinations)
+          assert matching_requests.any?, failure_message
+
+          non_required_search_parameters(matching_requests, all_required_search_parameters).each do |parameter|
+            warning "The client used the non-required search parameter `#{parameter}` for `Observation`. " \
+                    'The server may not accept search parameters other than those required by the IG CapabilityStatement.'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_pulse_oximetry_client_group.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'us_core_pulse_oximetry/us_core_pulse_oximetry_client_read_test'
-require_relative 'us_core_pulse_oximetry/us_core_pulse_oximetry_patient_code_client_search_test'
-require_relative 'us_core_pulse_oximetry/us_core_pulse_oximetry_patient_category_status_client_search_test'
-require_relative 'us_core_pulse_oximetry/us_core_pulse_oximetry_patient_category_client_search_test'
-require_relative 'us_core_pulse_oximetry/us_core_pulse_oximetry_patient_category_date_client_search_test'
+require_relative 'us_core_pulse_oximetry/us_core_pulse_oximetry_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -26,29 +23,23 @@ conforming to the US Core Pulse Oximetry Profile.
 ## Data Access Supported
 
 Clients may not be required to support the Observation FHIR resource type. However, if they
-do support it, they must support the US Core Pulse Oximetry Profile and the resource type's search parameters.
+do support it, they must support the US Core Pulse Oximetry Profile and use a supported search to access its data.
 The tests in this group will not execute if client makes no attempt to access data for the
 Observation resource type. In this case, the test will be marked as skip if support
 for the resource type is required, and omitted otherwise.
 
 ## Reading
-This test will check that the client performed a read of the following id:
-
-* `usqualitycore-us-core-pulse-oximetry`
+This test checks that the client performed a read of any Observation resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-Observation resource type with the following required parameters:
+The client must demonstrate at least one of the following search parameter
+combinations supported by the server for Observation:
 
 * patient + code
 * patient + category + status
 * patient + category
 * patient + category + date
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -57,10 +48,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_us_core_pulse_oximetry_client_read_test
-        test from: :us_quality_core_v050_us_core_pulse_oximetry_patient_code_client_search_test
-        test from: :us_quality_core_v050_us_core_pulse_oximetry_patient_category_status_client_search_test
-        test from: :us_quality_core_v050_us_core_pulse_oximetry_patient_category_client_search_test
-        test from: :us_quality_core_v050_us_core_pulse_oximetry_patient_category_date_client_search_test
+        test from: :us_quality_core_v050_us_core_pulse_oximetry_client_search_test
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_respiratory_rate/us_core_respiratory_rate_client_read_test.rb

@@ -4,30 +4,23 @@ module USQualityCoreTestKit
   module Client
     module USQualityCoreClientV050
       class UsCoreRespiratoryRateClientReadTest < Inferno::Test
-        include TestHelper
-
         id :us_quality_core_v050_us_core_respiratory_rate_client_read_test
 
-        title 'SHALL support read of UsCoreRespiratoryRate'
+        title 'SHALL support read of Observation'
 
         description %(
-          The client demonstrates SHALL support for reading UsCoreRespiratoryRate.
+          The client demonstrates SHALL support for reading the Observation resource type.
         )
 
+        optional true
+
         def skip_message
           "Inferno did not receive any read requests for the `Observation` resource type."
         end
 
-        def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Core Respiratory Rate Profile: `Observation/usqualitycore-us-core-respiratory-rate`."
-        end
-
         run do
           requests = load_tagged_requests(READ_OBSERVATION_TAG)
           skip_if requests.blank?, skip_message
-
-          requests_for_id = filter_requests_by_resource_id(requests, 'usqualitycore-us-core-respiratory-rate')
-          assert requests_for_id.any?, failure_message
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_respiratory_rate/us_core_respiratory_rate_client_search_test.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Only SHALL client searches are generated. SHOULD search tests may be added later.
+module USQualityCoreTestKit
+  module Client
+    module USQualityCoreClientV050
+      class UsCoreRespiratoryRateClientSearchTest < Inferno::Test
+        include TestHelper
+
+        id :us_quality_core_v050_us_core_respiratory_rate_client_search_test
+
+        title 'Search Observation using a supported combination'
+
+        description %(
+          The client demonstrates at least one required server search combination for UsCoreRespiratoryRate.
+          Accepted combinations: `patient + code`, `patient + category + status`, `patient + category`, `patient + category + date`.
+        )
+
+        def required_search_combinations
+          [["patient", "code"], ["patient", "category", "status"], ["patient", "category"], ["patient", "category", "date"]]
+        end
+
+        def skip_message
+          'Inferno did not receive any search requests for the `Observation` resource type.'
+        end
+
+        def failure_message
+          'Inferno did not receive a search for `Observation` using any of these combinations: ' \
+          "#{required_search_combinations.map { |names| names.join(' + ') }.join(', ')}."
+        end        
+
+        def all_required_search_parameters
+          ["patient", "code", "category", "status", "date"]
+        end
+
+        run do
+          requests = load_tagged_requests(SEARCH_OBSERVATION_TAG)
+          skip_if requests.blank?, skip_message
+
+          matching_requests = filter_requests_by_search_parameter_combinations(requests, required_search_combinations)
+          assert matching_requests.any?, failure_message
+
+          non_required_search_parameters(matching_requests, all_required_search_parameters).each do |parameter|
+            warning "The client used the non-required search parameter `#{parameter}` for `Observation`. " \
+                    'The server may not accept search parameters other than those required by the IG CapabilityStatement.'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/us_core_respiratory_rate_client_group.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'us_core_respiratory_rate/us_core_respiratory_rate_client_read_test'
-require_relative 'us_core_respiratory_rate/us_core_respiratory_rate_patient_code_client_search_test'
-require_relative 'us_core_respiratory_rate/us_core_respiratory_rate_patient_category_status_client_search_test'
-require_relative 'us_core_respiratory_rate/us_core_respiratory_rate_patient_category_client_search_test'
-require_relative 'us_core_respiratory_rate/us_core_respiratory_rate_patient_category_date_client_search_test'
+require_relative 'us_core_respiratory_rate/us_core_respiratory_rate_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -26,29 +23,23 @@ conforming to the US Core Respiratory Rate Profile.
 ## Data Access Supported
 
 Clients may not be required to support the Observation FHIR resource type. However, if they
-do support it, they must support the US Core Respiratory Rate Profile and the resource type's search parameters.
+do support it, they must support the US Core Respiratory Rate Profile and use a supported search to access its data.
 The tests in this group will not execute if client makes no attempt to access data for the
 Observation resource type. In this case, the test will be marked as skip if support
 for the resource type is required, and omitted otherwise.
 
 ## Reading
-This test will check that the client performed a read of the following id:
-
-* `usqualitycore-us-core-respiratory-rate`
+This test checks that the client performed a read of any Observation resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-Observation resource type with the following required parameters:
+The client must demonstrate at least one of the following search parameter
+combinations supported by the server for Observation:
 
 * patient + code
 * patient + category + status
 * patient + category
 * patient + category + date
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -57,10 +48,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_us_core_respiratory_rate_client_read_test
-        test from: :us_quality_core_v050_us_core_respiratory_rate_patient_code_client_search_test
-        test from: :us_quality_core_v050_us_core_respiratory_rate_patient_category_status_client_search_test
-        test from: :us_quality_core_v050_us_core_respiratory_rate_patient_category_client_search_test
-        test from: :us_quality_core_v050_us_core_respiratory_rate_patient_category_date_client_search_test
+        test from: :us_quality_core_v050_us_core_respiratory_rate_client_search_test
       end
     end
   end