us_quality_core_test_kit 0.2.0 → 0.2.1

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

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'servicenotrequested/servicenotrequested_client_read_test'
-require_relative 'servicenotrequested/servicenotrequested_patient_do_not_perform_client_search_test'
-require_relative 'servicenotrequested/servicenotrequested_id_client_search_test'
-require_relative 'servicenotrequested/servicenotrequested_patient_client_search_test'
-require_relative 'servicenotrequested/servicenotrequested_patient_category_client_search_test'
-require_relative 'servicenotrequested/servicenotrequested_patient_category_authored_client_search_test'
-require_relative 'servicenotrequested/servicenotrequested_patient_code_client_search_test'
+require_relative 'servicenotrequested/servicenotrequested_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -28,19 +23,17 @@ conforming to the US Quality Core Service Not Requested Profile.
 ## Data Access Supported
 
 Clients may not be required to support the ServiceRequest FHIR resource type. However, if they
-do support it, they must support the US Quality Core Service Not Requested Profile and the resource type's search parameters.
+do support it, they must support the US Quality Core Service Not Requested 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
 ServiceRequest 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-serviceprohibited`
+This test checks that the client performed a read of any ServiceRequest resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-ServiceRequest 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 ServiceRequest:
 
 * patient + do-not-perform
 * _id
@@ -49,10 +42,6 @@ ServiceRequest resource type with the following required parameters:
 * patient + category + authored
 * patient + code
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -61,12 +50,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_servicenotrequested_client_read_test
-        test from: :us_quality_core_v050_servicenotrequested_patient_do_not_perform_client_search_test
-        test from: :us_quality_core_v050_servicenotrequested_id_client_search_test
-        test from: :us_quality_core_v050_servicenotrequested_patient_client_search_test
-        test from: :us_quality_core_v050_servicenotrequested_patient_category_client_search_test
-        test from: :us_quality_core_v050_servicenotrequested_patient_category_authored_client_search_test
-        test from: :us_quality_core_v050_servicenotrequested_patient_code_client_search_test
+        test from: :us_quality_core_v050_servicenotrequested_client_search_test
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/servicerequest/servicerequest_client_read_test.rb

@@ -4,30 +4,23 @@ module USQualityCoreTestKit
   module Client
     module USQualityCoreClientV050
       class ServicerequestClientReadTest < Inferno::Test
-        include TestHelper
-
         id :us_quality_core_v050_servicerequest_client_read_test
 
-        title 'SHALL support read of Servicerequest'
+        title 'SHALL support read of ServiceRequest'
 
         description %(
-          The client demonstrates SHALL support for reading Servicerequest.
+          The client demonstrates SHALL support for reading the ServiceRequest resource type.
         )
 
+        optional true
+
         def skip_message
           "Inferno did not receive any read requests for the `ServiceRequest` resource type."
         end
 
-        def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Quality Core ServiceRequest Profile: `ServiceRequest/usqualitycore-servicerequest`."
-        end
-
         run do
           requests = load_tagged_requests(READ_SERVICE_REQUEST_TAG)
           skip_if requests.blank?, skip_message
-
-          requests_for_id = filter_requests_by_resource_id(requests, 'usqualitycore-servicerequest')
-          assert requests_for_id.any?, failure_message
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/servicerequest/servicerequest_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 ServicerequestClientSearchTest < Inferno::Test
+        include TestHelper
+
+        id :us_quality_core_v050_servicerequest_client_search_test
+
+        title 'Search ServiceRequest using a supported combination'
+
+        description %(
+          The client demonstrates at least one required server search combination for Servicerequest.
+          Accepted combinations: `patient + do-not-perform`, `_id`, `patient`, `patient + category`, `patient + category + authored`, `patient + code`.
+        )
+
+        def required_search_combinations
+          [["patient", "do-not-perform"], ["_id"], ["patient"], ["patient", "category"], ["patient", "category", "authored"], ["patient", "code"]]
+        end
+
+        def skip_message
+          'Inferno did not receive any search requests for the `ServiceRequest` resource type.'
+        end
+
+        def failure_message
+          'Inferno did not receive a search for `ServiceRequest` using any of these combinations: ' \
+          "#{required_search_combinations.map { |names| names.join(' + ') }.join(', ')}."
+        end        
+
+        def all_required_search_parameters
+          ["patient", "do-not-perform", "_id", "category", "authored", "code"]
+        end
+
+        run do
+          requests = load_tagged_requests(SEARCH_SERVICE_REQUEST_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 `ServiceRequest`. " \
+                    '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/servicerequest_client_group.rb

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'servicerequest/servicerequest_client_read_test'
-require_relative 'servicerequest/servicerequest_patient_do_not_perform_client_search_test'
-require_relative 'servicerequest/servicerequest_id_client_search_test'
-require_relative 'servicerequest/servicerequest_patient_client_search_test'
-require_relative 'servicerequest/servicerequest_patient_category_client_search_test'
-require_relative 'servicerequest/servicerequest_patient_category_authored_client_search_test'
-require_relative 'servicerequest/servicerequest_patient_code_client_search_test'
+require_relative 'servicerequest/servicerequest_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -28,19 +23,17 @@ conforming to the US Quality Core ServiceRequest Profile.
 ## Data Access Supported
 
 Clients may not be required to support the ServiceRequest FHIR resource type. However, if they
-do support it, they must support the US Quality Core ServiceRequest Profile and the resource type's search parameters.
+do support it, they must support the US Quality Core ServiceRequest 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
 ServiceRequest 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-servicerequest`
+This test checks that the client performed a read of any ServiceRequest resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-ServiceRequest 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 ServiceRequest:
 
 * patient + do-not-perform
 * _id
@@ -49,10 +42,6 @@ ServiceRequest resource type with the following required parameters:
 * patient + category + authored
 * patient + code
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -61,12 +50,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_servicerequest_client_read_test
-        test from: :us_quality_core_v050_servicerequest_patient_do_not_perform_client_search_test
-        test from: :us_quality_core_v050_servicerequest_id_client_search_test
-        test from: :us_quality_core_v050_servicerequest_patient_client_search_test
-        test from: :us_quality_core_v050_servicerequest_patient_category_client_search_test
-        test from: :us_quality_core_v050_servicerequest_patient_category_authored_client_search_test
-        test from: :us_quality_core_v050_servicerequest_patient_code_client_search_test
+        test from: :us_quality_core_v050_servicerequest_client_search_test
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/simple_observation/simple_observation_client_read_test.rb

@@ -4,30 +4,23 @@ module USQualityCoreTestKit
   module Client
     module USQualityCoreClientV050
       class SimpleObservationClientReadTest < Inferno::Test
-        include TestHelper
-
         id :us_quality_core_v050_simple_observation_client_read_test
 
-        title 'SHALL support read of SimpleObservation'
+        title 'SHALL support read of Observation'
 
         description %(
-          The client demonstrates SHALL support for reading SimpleObservation.
+          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 Quality Core Simple Observation Profile: `Observation/usqualitycore-simple-observation`."
-        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-simple-observation')
-          assert requests_for_id.any?, failure_message
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/simple_observation/simple_observation_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 SimpleObservationClientSearchTest < Inferno::Test
+        include TestHelper
+
+        id :us_quality_core_v050_simple_observation_client_search_test
+
+        title 'Search Observation using a supported combination'
+
+        description %(
+          The client demonstrates at least one required server search combination for SimpleObservation.
+          Accepted combinations: `patient + category + status`, `patient + category`, `patient + category + date`, `patient + code`.
+        )
+
+        def required_search_combinations
+          [["patient", "category", "status"], ["patient", "category"], ["patient", "category", "date"], ["patient", "code"]]
+        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", "category", "status", "date", "code"]
+        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/simple_observation_client_group.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'simple_observation/simple_observation_client_read_test'
-require_relative 'simple_observation/simple_observation_patient_category_status_client_search_test'
-require_relative 'simple_observation/simple_observation_patient_category_client_search_test'
-require_relative 'simple_observation/simple_observation_patient_category_date_client_search_test'
-require_relative 'simple_observation/simple_observation_patient_code_client_search_test'
+require_relative 'simple_observation/simple_observation_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -26,29 +23,23 @@ conforming to the US Quality Core Simple Observation 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 Quality Core Simple Observation Profile and the resource type's search parameters.
+do support it, they must support the US Quality Core Simple Observation 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-simple-observation`
+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 + category + status
 * patient + category
 * patient + category + date
 * patient + code
 
-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_simple_observation_client_read_test
-        test from: :us_quality_core_v050_simple_observation_patient_category_status_client_search_test
-        test from: :us_quality_core_v050_simple_observation_patient_category_client_search_test
-        test from: :us_quality_core_v050_simple_observation_patient_category_date_client_search_test
-        test from: :us_quality_core_v050_simple_observation_patient_code_client_search_test
+        test from: :us_quality_core_v050_simple_observation_client_search_test
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/specimen/specimen_client_read_test.rb

@@ -4,30 +4,23 @@ module USQualityCoreTestKit
   module Client
     module USQualityCoreClientV050
       class SpecimenClientReadTest < Inferno::Test
-        include TestHelper
-
         id :us_quality_core_v050_specimen_client_read_test
 
         title 'SHALL support read of Specimen'
 
         description %(
-          The client demonstrates SHALL support for reading Specimen.
+          The client demonstrates SHALL support for reading the Specimen resource type.
         )
 
+        optional false
+
         def skip_message
           "Inferno did not receive any read requests for the `Specimen` resource type."
         end
 
-        def failure_message
-          "Inferno did not receive the expected read request for the target instance of the US Core Specimen Profile: `Specimen/usqualitycore-specimen`."
-        end
-
         run do
           requests = load_tagged_requests(READ_SPECIMEN_TAG)
           skip_if requests.blank?, skip_message
-
-          requests_for_id = filter_requests_by_resource_id(requests, 'usqualitycore-specimen')
-          assert requests_for_id.any?, failure_message
         end
       end
     end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/specimen/specimen_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 SpecimenClientSearchTest < Inferno::Test
+        include TestHelper
+
+        id :us_quality_core_v050_specimen_client_search_test
+
+        title 'Search Specimen using a supported combination'
+
+        description %(
+          The client demonstrates at least one required server search combination for Specimen.
+          Accepted combinations: `_id`.
+        )
+
+        def required_search_combinations
+          [["_id"]]
+        end
+
+        def skip_message
+          'Inferno did not receive any search requests for the `Specimen` resource type.'
+        end
+
+        def failure_message
+          'Inferno did not receive a search for `Specimen` using any of these combinations: ' \
+          "#{required_search_combinations.map { |names| names.join(' + ') }.join(', ')}."
+        end        
+
+        def all_required_search_parameters
+          ["_id"]
+        end
+
+        run do
+          requests = load_tagged_requests(SEARCH_SPECIMEN_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 `Specimen`. " \
+                    '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/specimen_client_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'specimen/specimen_client_read_test'
-require_relative 'specimen/specimen_id_client_search_test'
+require_relative 'specimen/specimen_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -23,26 +23,20 @@ conforming to the US Core Specimen Profile.
 ## Data Access Supported
 
 Clients may not be required to support the Specimen FHIR resource type. However, if they
-do support it, they must support the US Core Specimen Profile and the resource type's search parameters.
+do support it, they must support the US Core Specimen 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
 Specimen 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-specimen`
+This test checks that the client performed a read of any Specimen resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-Specimen 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 Specimen:
 
 * _id
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -51,7 +45,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_specimen_client_read_test
-        test from: :us_quality_core_v050_specimen_id_client_search_test
+        test from: :us_quality_core_v050_specimen_client_search_test
       end
     end
   end

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/task/task_client_read_test.rb

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

data/lib/us_quality_core_test_kit/client/generated/v0.5.0/task/task_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 TaskClientSearchTest < Inferno::Test
+        include TestHelper
+
+        id :us_quality_core_v050_task_client_search_test
+
+        title 'Search Task using a supported combination'
+
+        description %(
+          The client demonstrates at least one required server search combination for Task.
+          Accepted combinations: `patient + status`, `patient`, `patient + code`.
+        )
+
+        def required_search_combinations
+          [["patient", "status"], ["patient"], ["patient", "code"]]
+        end
+
+        def skip_message
+          'Inferno did not receive any search requests for the `Task` resource type.'
+        end
+
+        def failure_message
+          'Inferno did not receive a search for `Task` using any of these combinations: ' \
+          "#{required_search_combinations.map { |names| names.join(' + ') }.join(', ')}."
+        end        
+
+        def all_required_search_parameters
+          ["patient", "status", "code"]
+        end
+
+        run do
+          requests = load_tagged_requests(SEARCH_TASK_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 `Task`. " \
+                    '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/task_client_group.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'task/task_client_read_test'
-require_relative 'task/task_patient_status_client_search_test'
-require_relative 'task/task_patient_client_search_test'
-require_relative 'task/task_patient_code_client_search_test'
+require_relative 'task/task_client_search_test'
 
 module USQualityCoreTestKit
   module Client
@@ -25,28 +23,22 @@ conforming to the US Quality Core Task Profile.
 ## Data Access Supported
 
 Clients may not be required to support the Task FHIR resource type. However, if they
-do support it, they must support the US Quality Core Task Profile and the resource type's search parameters.
+do support it, they must support the US Quality Core Task 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
 Task 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-task`
+This test checks that the client performed a read of any Task resource, regardless of its ID.
 
 ## Searching
-These tests will check that the client performed searches against the
-Task 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 Task:
 
 * patient + status
 * patient
 * patient + code
 
-Inferno will also look for searches using the following optional parameters:
-
-
-
 
         )
 
@@ -55,9 +47,7 @@ Inferno will also look for searches using the following optional parameters:
         run_as_group
 
         test from: :us_quality_core_v050_task_client_read_test
-        test from: :us_quality_core_v050_task_patient_status_client_search_test
-        test from: :us_quality_core_v050_task_patient_client_search_test
-        test from: :us_quality_core_v050_task_patient_code_client_search_test
+        test from: :us_quality_core_v050_task_client_search_test
       end
     end
   end