us_quality_core_test_kit 0.2.0 → 0.2.1

data/lib/us_quality_core_test_kit/client/generated/v1.0.0-ballot/wait_group.rb

@@ -70,118 +70,100 @@ module USQualityCoreTestKit
   The following requirements will be checked:
 
   * **Patient**
-  * read id:
-    * usqualitycore-patient
+  * read: any Patient resource (any ID)
   * searches:
     * _id
 * **AdverseEvent**
-  * read id:
-    * usqualitycore-adverse-event
+  * read: any AdverseEvent resource (any ID)
   * searches:
     * subject
     * subject + event
     * subject + recorded-date
 * **AllergyIntolerance**
-  * read id:
-    * usqualitycore-allergy-intolerance
+  * read: any AllergyIntolerance resource (any ID)
   * searches:
     * patient
 * **CarePlan**
-  * read id:
-    * usqualitycore-care-plan
+  * read: any CarePlan resource (any ID)
   * searches:
     * patient + category
 * **CareTeam**
-  * read id:
-    * usqualitycore-care-team
+  * read: any CareTeam resource (any ID)
   * searches:
     * patient + status
 * **Communication**
-  * read id:
-    * usqualitycore-communication
+  * read: any Communication resource (any ID)
   * searches:
     * subject + status
     * subject
     * subject + topic
 * **Communicationdone**
-  * read id:
-    * usqualitycore-communication
+  * read: any Communication resource (any ID)
   * searches:
     * subject + status
     * subject
     * subject + topic
 * **Communicationnotdone**
-  * read id:
-    * usqualitycore-communicationnotdone
+  * read: any Communication resource (any ID)
   * searches:
     * subject + status
     * subject
     * subject + topic
 * **ConditionEncounterDiagnosis**
-  * read id:
-    * usqualitycore-condition-encounter-diagnosis
+  * read: any Condition resource (any ID)
   * searches:
     * patient + category
     * patient
     * patient + code
 * **ConditionProblemsHealthConcerns**
-  * read id:
-    * usqualitycore-condition-problems-health-concerns
+  * read: any Condition resource (any ID)
   * searches:
     * patient + category
     * patient
     * patient + code
 * **Coverage**
-  * read id:
-    * usqualitycore-coverage
+  * read: any Coverage resource (any ID)
   * searches:
     * patient
 * **Device**
-  * read id:
-    * usqualitycore-device
+  * read: any Device resource (any ID)
   * searches:
     * patient
     * patient + type
 * **Devicerequest**
-  * read id:
-    * usqualitycore-devicerequest
+  * read: any DeviceRequest resource (any ID)
   * searches:
     * patient
     * patient + code
     * patient + do-not-perform
 * **Devicerequested**
-  * read id:
-    * usqualitycore-devicerequest
+  * read: any DeviceRequest resource (any ID)
   * searches:
     * patient + do-not-perform
     * patient
     * patient + code
 * **Deviceprohibited**
-  * read id:
-    * usqualitycore-deviceprohibited
+  * read: any DeviceRequest resource (any ID)
   * searches:
     * patient + do-not-perform
     * patient
     * patient + code
 * **DiagnosticReportNote**
-  * read id:
-    * usqualitycore-diagnostic-report-note
+  * read: any DiagnosticReport resource (any ID)
   * searches:
     * patient + category
     * patient
     * patient + category + date
     * patient + code
 * **DiagnosticReportLab**
-  * read id:
-    * usqualitycore-diagnostic-report-lab
+  * read: any DiagnosticReport resource (any ID)
   * searches:
     * patient + category
     * patient
     * patient + category + date
     * patient + code
 * **UsCoreDocumentreference**
-  * read id:
-    * usqualitycore-us-core-documentreference
+  * read: any DocumentReference resource (any ID)
   * searches:
     * patient + category
     * patient
@@ -189,8 +171,7 @@ module USQualityCoreTestKit
     * patient + type
     * patient + category + date
 * **UsCoreAdiDocumentreference**
-  * read id:
-    * usqualitycore-us-core-adi-documentreference
+  * read: any DocumentReference resource (any ID)
   * searches:
     * patient + category
     * patient
@@ -198,308 +179,264 @@ module USQualityCoreTestKit
     * patient + type
     * patient + category + date
 * **FamilyMemberHistory**
-  * read id:
-    * usqualitycore-family-member-history
+  * read: any FamilyMemberHistory resource (any ID)
   * searches:
     * patient
 * **Goal**
-  * read id:
-    * usqualitycore-goal
+  * read: any Goal resource (any ID)
   * searches:
     * patient
 * **ImagingStudy**
-  * read id:
-    * usqualitycore-imaging-study
+  * read: any ImagingStudy resource (any ID)
   * searches:
     * subject
 * **Immunization**
-  * read id:
-    * usqualitycore-immunization
+  * read: any Immunization resource (any ID)
   * searches:
     * patient + status
     * patient
 * **Immunizationnotdone**
-  * read id:
-    * usqualitycore-immunizationnotdone
+  * read: any Immunization resource (any ID)
   * searches:
     * patient + status
     * patient
 * **Immunizationdone**
-  * read id:
-    * usqualitycore-immunization
+  * read: any Immunization resource (any ID)
   * searches:
     * patient + status
     * patient
 * **Medicationadministration**
-  * read id:
-    * usqualitycore-medicationadministration
+  * read: any MedicationAdministration resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + code
     * patient + effective-time
 * **Medicationadministrationnotdone**
-  * read id:
-    * usqualitycore-medicationadministrationnotdone
+  * read: any MedicationAdministration resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + code
     * patient + effective-time
 * **Medicationadministrationdone**
-  * read id:
-    * usqualitycore-medicationadministration
+  * read: any MedicationAdministration resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + code
     * patient + effective-time
 * **Medicationdispense**
-  * read id:
-    * usqualitycore-medicationdispense
+  * read: any MedicationDispense resource (any ID)
   * searches:
     * patient + status
     * patient
 * **Medicationdispensedeclined**
-  * read id:
-    * usqualitycore-medicationdispensedeclined
+  * read: any MedicationDispense resource (any ID)
   * searches:
     * patient + status
     * patient
 * **Medicationdispensedone**
-  * read id:
-    * usqualitycore-medicationdispense
+  * read: any MedicationDispense resource (any ID)
   * searches:
     * patient + status
     * patient
 * **Medicationrequest**
-  * read id:
-    * usqualitycore-medicationrequest
+  * read: any MedicationRequest resource (any ID)
   * searches:
     * patient + intent
     * patient + intent + do-not-perform
 * **Medicationprohibited**
-  * read id:
-    * usqualitycore-medicationprohibited
+  * read: any MedicationRequest resource (any ID)
   * searches:
     * patient + intent + do-not-perform
     * patient + intent
 * **Medicationrequested**
-  * read id:
-    * usqualitycore-medicationrequest
+  * read: any MedicationRequest resource (any ID)
   * searches:
     * patient + intent + do-not-perform
     * patient + intent
 * **NutritionOrder**
-  * read id:
-    * usqualitycore-nutrition-order
+  * read: any NutritionOrder resource (any ID)
   * searches:
     * patient
 * **ObservationClinicalResult**
-  * read id:
-    * usqualitycore-observation-clinical-result
-    * usqualitycore-observation-lab
+  * read: any Observation resource (any ID)
   * searches:
     * patient + category + status
     * patient + category
     * patient + category + date
     * patient + code
 * **UsCoreObservationAdiDocumentation**
-  * read id:
-    * usqualitycore-us-core-observation-adi-documentation
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreTreatmentInterventionPreference**
-  * read id:
-    * usqualitycore-us-core-treatment-intervention-preference
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **SimpleObservation**
-  * read id:
-    * usqualitycore-simple-observation
+  * read: any Observation resource (any ID)
   * searches:
     * patient + category + status
     * patient + category
     * patient + category + date
     * patient + code
 * **ObservationScreeningAssessment**
-  * read id:
-    * usqualitycore-observation-screening-assessment
+  * read: any Observation resource (any ID)
   * searches:
     * patient + category + status
     * patient + category
     * patient + category + date
     * patient + code
 * **UsCoreObservationPregnancystatus**
-  * read id:
-    * usqualitycore-us-core-observation-pregnancystatus
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreObservationPregnancyintent**
-  * read id:
-    * usqualitycore-us-core-observation-pregnancyintent
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreSmokingstatus**
-  * read id:
-    * usqualitycore-us-core-smokingstatus
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **ObservationLab**
-  * read id:
-    * usqualitycore-observation-lab
+  * read: any Observation resource (any ID)
   * searches:
     * patient + category + status
     * patient + category
     * patient + category + date
     * patient + code
 * **UsCoreObservationOccupation**
-  * read id:
-    * usqualitycore-us-core-observation-occupation
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreBloodPressure**
-  * read id:
-    * usqualitycore-us-core-blood-pressure
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreBmi**
-  * read id:
-    * usqualitycore-us-core-bmi
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **PediatricBmiForAge**
-  * read id:
-    * usqualitycore-pediatric-bmi-for-age
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreBodyHeight**
-  * read id:
-    * usqualitycore-us-core-body-height
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreBodyTemperature**
-  * read id:
-    * usqualitycore-us-core-body-temperature
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreBodyWeight**
-  * read id:
-    * usqualitycore-us-core-body-weight
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **HeadOccipitalFrontalCircumferencePercentile**
-  * read id:
-    * usqualitycore-head-circumference-percentile
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreHeartRate**
-  * read id:
-    * usqualitycore-us-core-heart-rate
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCorePulseOximetry**
-  * read id:
-    * usqualitycore-us-core-pulse-oximetry
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **UsCoreRespiratoryRate**
-  * read id:
-    * usqualitycore-us-core-respiratory-rate
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **PediatricWeightForHeight**
-  * read id:
-    * usqualitycore-pediatric-weight-for-height
+  * read: any Observation resource (any ID)
   * searches:
     * patient + code
     * patient + category + status
     * patient + category
     * patient + category + date
 * **Procedure**
-  * read id:
-    * usqualitycore-procedure
+  * read: any Procedure resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + date
 * **Procedurenotdone**
-  * read id:
-    * usqualitycore-procedurenotdone
+  * read: any Procedure resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + date
 * **Proceduredone**
-  * read id:
-    * usqualitycore-procedure
+  * read: any Procedure resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + date
 * **QuestionnaireResponse**
-  * read id:
-    * usqualitycore-questionnaire-response
+  * read: any QuestionnaireResponse resource (any ID)
   * searches:
     * patient
     * patient + questionnaire
 * **RelatedPerson**
-  * read id:
-    * usqualitycore-related-person
+  * read: any RelatedPerson resource (any ID)
   * searches:
     * patient
     * _id
 * **Servicerequest**
-  * read id:
-    * usqualitycore-servicerequest
+  * read: any ServiceRequest resource (any ID)
   * searches:
     * patient
     * _id
@@ -508,8 +445,7 @@ module USQualityCoreTestKit
     * patient + code
     * patient + do-not-perform
 * **Serviceprohibited**
-  * read id:
-    * usqualitycore-serviceprohibited
+  * read: any ServiceRequest resource (any ID)
   * searches:
     * patient + do-not-perform
     * _id
@@ -518,8 +454,7 @@ module USQualityCoreTestKit
     * patient + category + authored
     * patient + code
 * **Servicerequested**
-  * read id:
-    * usqualitycore-servicerequest
+  * read: any ServiceRequest resource (any ID)
   * searches:
     * patient + do-not-perform
     * _id
@@ -528,62 +463,52 @@ module USQualityCoreTestKit
     * patient + category + authored
     * patient + code
 * **Task**
-  * read id:
-    * usqualitycore-task
+  * read: any Task resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + code
 * **Taskrejected**
-  * read id:
-    * usqualitycore-taskrejected
+  * read: any Task resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + code
 * **Taskdone**
-  * read id:
-    * usqualitycore-task
+  * read: any Task resource (any ID)
   * searches:
     * patient + status
     * patient
     * patient + code
 * **Encounter**
-  * read id:
-    * usqualitycore-encounter
+  * read: any Encounter resource (any ID)
   * searches:
     * patient
     * _id
     * patient + type
     * patient + date
 * **Location**
-  * read id:
-    * usqualitycore-location
+  * read: any Location resource (any ID)
   * searches:
 
 * **Organization**
-  * read id:
-    * usqualitycore-organization
+  * read: any Organization resource (any ID)
   * searches:
 
 * **Practitioner**
-  * read id:
-    * usqualitycore-practitioner
+  * read: any Practitioner resource (any ID)
   * searches:
 
 * **PractitionerRole**
-  * read id:
-    * usqualitycore-practitioner-role
+  * read: any PractitionerRole resource (any ID)
   * searches:
 
 * **Provenance**
-  * read id:
-    * usqualitycore-provenance
+  * read: any Provenance resource (any ID)
   * searches:
 
 * **Specimen**
-  * read id:
-    * usqualitycore-specimen
+  * read: any Specimen resource (any ID)
   * searches:
     * _id
                 ),

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

@@ -41,40 +41,23 @@ module USQualityCoreTestKit
             ## Data Access Supported
 
             Clients may not be required to support the #{resource_type} FHIR resource type. However, if they
-            do support it, they must support the #{profile_name} and the resource type's search parameters.
+            do support it, they must support the #{profile_name} 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
             #{resource_type} 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 #{expected_resource_id.length > 1 ? 'one of the following ids' : 'the following id'}:
-
-            #{expected_resource_id_string}
+            This test checks that the client performed a read of any #{resource_type} resource, regardless of its ID.
 
             ## Searching
-            These tests will check that the client performed searches against the
-            #{resource_type} 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 #{resource_type}:
 
             #{search_param_name_string}
 
-            Inferno will also look for searches using the following optional parameters:
-
-            #{optional_search_param_name_string}
-
           DESCRIPTION
         end
 
-        def optional_searches
-          group_metadata.searches.reject { |search| search[:expectation] == 'SHALL' }
-        end
-
-        def optional_search_param_name_string
-          optional_searches
-            .map { |search| search[:names].join(' + ') }
-            .map { |names| "* #{names}" }
-            .join("\n")
-        end
-
         def conformance_optional?
           group_metadata.resource_conformance_expectation != 'SHALL'
         end
@@ -84,18 +67,6 @@ module USQualityCoreTestKit
           group_metadata.id = group_id
           group_metadata.file_name = base_output_file_name
         end
-
-        def expected_resource_id
-          resource_id = [USQualityCoreTestKit::Generator::Naming.instance_id_for_profile(profile_identifier)]
-
-          resource_id << USQualityCoreTestKit::Generator::Naming.instance_id_for_profile('observation_lab') if profile_identifier == 'observation_clinical_result'
-
-          resource_id
-        end
-
-        def expected_resource_id_string
-          expected_resource_id.map { |id| "* `#{id}`" }.join("\n")
-        end
       end
     end
   end

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

@@ -36,31 +36,16 @@ module USQualityCoreTestKit
           group_metadata.resource
         end
 
-        def expected_resource_id
-          if profile_identifier == 'observation_clinical_result'
-            [USQualityCoreTestKit::Generator::Naming.instance_id_for_profile(profile_identifier),
-             USQualityCoreTestKit::Generator::Naming.instance_id_for_profile('observation_lab')]
-          else
-            USQualityCoreTestKit::Generator::Naming.instance_id_for_profile(profile_identifier)
-          end
-        end
-
-        def expected_resource_id_string
-          Array(expected_resource_id).map { |id| "`#{resource_type}/#{id}`" }.join(', ')
-        end
-
-        def expected_resource_id_literal
-          return expected_resource_id.inspect if expected_resource_id.is_a?(Array)
-
-          "'#{expected_resource_id}'"
+        def optional?
+          resource_type != 'Patient' && !group_metadata.delayed?
         end
 
         def title
-          "#{conformance_expectation} support read of #{profile_identifier.camelize}"
+          "#{conformance_expectation} support read of #{resource_type}"
         end
 
         def description
-          "The client demonstrates #{conformance_expectation} support for reading #{profile_identifier.camelize}."
+          "The client demonstrates #{conformance_expectation} support for reading the #{resource_type} resource type."
         end
       end
     end