au_core_test_kit 1.4.0 → 1.4.2

data/lib/au_core_test_kit/generated/v2.0.0/condition/condition_patient_search_test.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../../search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class ConditionPatientSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(SHALL) Server returns valid results for Condition search by patient'
       description %(
@@ -18,8 +18,7 @@ none are returned, the test is skipped.
 
 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. AU
-Core requires that both forms are supported by AU Core responders.
+different forms are expected to return the same number of results. AU Core requires that both forms are supported by AU Core responders.
 
 Because this is the first search of the sequence, resources in the
 response will be used for subsequent tests.
@@ -29,7 +28,7 @@ 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 AU Core v2.0.0.
 
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/CapabilityStatement/au-core-responder)
 
       )
 
@@ -39,8 +38,14 @@ requirement of AU Core v2.0.0.
             description: 'Comma separated list of patient IDs that in sum contain all MUST SUPPORT elements',
             default: 'baratz-toni, irvine-ronny-lawrence, italia-sofia, howe-deangelo, hayes-arianne, baby-banks-john, banks-mia-leanne'
 
+      def self.demodata
+        @demodata ||= InfernoSuiteGenerator::Generator::IGDemodata.new(
+          YAML.load_file(File.join(File.dirname(__dir__), 'demodata.yml'), aliases: true)
+        )
+      end
+
       def self.properties
-        @properties ||= SearchTestProperties.new(
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(
           first_search: true,
           resource_type: 'Condition',
           search_param_names: ['patient'],
@@ -51,13 +56,17 @@ requirement of AU Core v2.0.0.
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources
         scratch[:condition_resources] ||= {}
       end
 
+      def keep_all_search_results?
+        false
+      end
+
       run do
         run_search_test
       end

data/lib/au_core_test_kit/generated/v2.0.0/condition/condition_read_test.rb

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
 
-require_relative '../../../read_test'
+require 'inferno_suite_generator/test_modules/read_test'
 
 module AUCoreTestKit
   module AUCoreV200
     class ConditionReadTest < Inferno::Test
-      include AUCoreTestKit::ReadTest
+      include InfernoSuiteGenerator::ReadTest
 
       title '(SHALL) Server returns correct Condition resource from Condition read interaction'
       description 'A server SHALL support the Condition read interaction.'
 
       id :au_core_v200_condition_read_test
 
+      def self.demodata
+        @demodata ||= InfernoSuiteGenerator::Generator::IGDemodata.new(
+          YAML.load_file(File.join(File.dirname(__dir__), 'demodata.yml'), aliases: true)
+        )
+      end
+
       def resource_type
         'Condition'
       end

data/lib/au_core_test_kit/generated/v2.0.0/condition/condition_reference_resolution_test.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../../reference_resolution_test'
+require 'inferno_suite_generator/test_modules/reference_resolution_test'
 
 module AUCoreTestKit
   module AUCoreV200
     class ConditionReferenceResolutionTest < Inferno::Test
-      include AUCoreTestKit::ReferenceResolutionTest
+      include InfernoSuiteGenerator::ReferenceResolutionTest
 
       title 'MustSupport references within Condition resources are valid'
       description %(
@@ -27,7 +27,7 @@ module AUCoreTestKit
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources
@@ -35,7 +35,7 @@ module AUCoreTestKit
       end
 
       run do
-        perform_reference_resolution_test(scratch_resources[:all])
+        perform_reference_resolution_test(scratch_resources[:all], { 'http://hl7.org.au/fhir/StructureDefinition/au-specimen' => 'http://hl7.org.au/fhir/StructureDefinition/au-specimen' })
       end
     end
   end

data/lib/au_core_test_kit/generated/v2.0.0/condition/condition_validation_test.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../../validation_test'
+require 'inferno_suite_generator/test_modules/validation_test'
 
 module AUCoreTestKit
   module AUCoreV200
     class ConditionValidationTest < Inferno::Test
-      include AUCoreTestKit::ValidationTest
+      include InfernoSuiteGenerator::ValidationTest
 
       id :au_core_v200_condition_validation_test
       title 'Condition resources returned during previous tests conform to the AU Core Condition'
@@ -31,6 +31,10 @@ fail if their code/system are not found in the valueset.
         scratch[:condition_resources] ||= {}
       end
 
+      def filter_set
+        []
+      end
+
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition',

data/lib/au_core_test_kit/generated/v2.0.0/condition/metadata.yml

@@ -126,10 +126,10 @@
       :eb: MAY
       :ap: MAY
     :values:
-    - ge1950-01-01T00:00:00.000Z
-    - le2050-01-01T23:59:59.999Z
-    - gt1950-01-01T00:00:00.000Z
-    - lt2050-01-01T23:59:59.999Z
+    - ge1950-01-01
+    - le2050-01-01
+    - gt1950-01-01
+    - lt2050-01-01
     :type: date
     :contains_multiple: false
     :multiple_and: SHOULD
@@ -189,6 +189,8 @@
 - :path: Condition.subject
   :profiles:
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient
+  :resource_types:
+  - Patient
 - :path: Condition.encounter
   :profiles:
   - http://hl7.org/fhir/StructureDefinition/Encounter|4.0.1

data/lib/au_core_test_kit/generated/v2.0.0/condition_group.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'inferno_suite_generator/core/ig_demodata'
 require_relative 'condition/condition_patient_search_test'
 require_relative 'condition/condition_category_search_test'
 require_relative 'condition/condition_clinical_status_search_test'
@@ -85,7 +86,7 @@ read succeeds.
       run_as_group
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'condition', 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'condition', 'metadata.yml'), aliases: true))
       end
 
       test from: :au_core_v200_condition_patient_search_test