au_ps_inferno 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7ab5a88c5bbe96574996354c088806de73490d210c03a0329580336d71b380
-  data.tar.gz: 17ed059f795f6544e865b8184bf22b9fde671d8702ca6d22b45eed05177f4c01
+  metadata.gz: 6316b514f80af300008b937f2c8f54637ffacb32af34a7633409084efd0252b8
+  data.tar.gz: ca3b0bf435ec0dca9a8e82c7df58e060eae051ccb62c7bcddc049441543b51e6
 SHA512:
-  metadata.gz: b083d7c4f47fdba7a4d566365d9008435f2a55d4b18debf4411df6b58f0cb1326f366dcf16e2f497f4c0e284d82eca95a7d42a372251be0f6285a90bade19b5d
-  data.tar.gz: 45c676d1c0f3f8dd0e15de165e173770d8869884cdb1f462ad7f550544df5532f7deca86aef12e0b609dec59f2d6133877a547666d36686e326ad8e4a79c848a
+  metadata.gz: 7398b7cc5249a0dc1058452620cc5cf4639ec424513ce8ee7ccdb16ce069e5795390e8e9c54cd083f702008490054532bf6ab7080ad1452124f2adb16c25b448
+  data.tar.gz: '026914eaed1aaedb89cedd566d42c71eb38aa5f24861d4527830c35c4ae07be8f68151b65a9978067f555f05fe4441b58cdf9f87cc301ae169dac5b3e22a6b8a'

data/lib/au_ps_inferno/suite/au_ps_bundle_instance/au_ps_bundle_instance.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'bundle_acquisition'
+
 require_relative 'bundle_validation'
 
 require_relative 'au_ps_bundle_must_support_conformance'
@@ -31,6 +33,8 @@ module AUPSTestKit
 
     run_as_group
 
+    group from: :suite_au_ps_bundle_instance_bundle_acquisition
+
     group from: :suite_au_ps_bundle_instance_bundle_validation
 
     group from: :suite_au_ps_bundle_instance_au_ps_bundle_must_support_conformance

data/lib/au_ps_inferno/suite/au_ps_bundle_instance/bundle_acquisition.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative 'suite_au_ps_bundle_instance_bundle_provide'
+
+module AUPSTestKit
+  # Automatically generated primitive group for Provide AU PS Bundle
+  class AUPSSuiteAuPsBundleInstanceBundleAcquisition < Inferno::TestGroup
+    title 'Provide AU PS Bundle'
+    description 'Loads the Bundle resource pasted as text and stores it for the validation tests in this group.'
+    id :suite_au_ps_bundle_instance_bundle_acquisition
+
+    run_as_group
+
+    test from: :suite_au_ps_bundle_instance_bundle_provide
+  end
+end

data/lib/au_ps_inferno/suite/au_ps_bundle_instance/suite_au_ps_bundle_instance_bundle_provide.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../../utils/basic_test_class'
+require_relative '../../utils/metadata_manager'
+
+require_relative '../../utils/provided_bundle_test_class'
+
+module AUPSTestKit
+  # Automatically generated primitive test for Bundle instance is parsable
+  class AUPSSuiteAuPsBundleInstanceBundleValidationLoadTheProvidedAuPsBundle < ProvidedBundleTestClass
+    title 'Bundle instance is parsable'
+    description 'The provided text can be parsed as a FHIR resource (JSON or XML) and its resourceType is ' \
+                'Bundle. The parsed Bundle is stored for the validation tests in this group; conformance to the ' \
+                'AU PS Bundle profile is tested separately under Bundle Validation.'
+    id :suite_au_ps_bundle_instance_bundle_provide
+
+    def metadata_manager
+      @metadata_manager ||= MetadataManager.new(File.expand_path('../../metadata.yaml', __dir__))
+    end
+  end
+end

data/lib/au_ps_inferno/suite/au_ps_retrieve_cs_group/au_ps_cs_is_valid_test.rb

@@ -10,7 +10,7 @@ module AUPSTestKit
     id :au_ps_cs_is_valid_100preview
 
     run do
-      skip_if url.blank?, 'No FHIR server specified'
+      omit_if url.blank?, NO_SERVER_URL_OMIT_MESSAGE
       fhir_get_capability_statement
       scratch[:capability_statement] = resource
       info "Capability Statement saved to scratch: #{scratch[:capability_statement]}"

data/lib/au_ps_inferno/suite/au_ps_retrieve_cs_group/au_ps_cs_supports_au_ps_profiles.rb

@@ -23,7 +23,8 @@ module AUPSTestKit
     end
 
     run do
-      skip_if scratch[:capability_statement].blank?, 'No CapabilityStatement resource provided'
+      omit_if url.blank?, NO_SERVER_URL_OMIT_MESSAGE
+      skip_if scratch[:capability_statement].blank?, 'CapabilityStatement was not retrieved from the server'
       check_profiles_status(
         { 'http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-allergyintolerance' => 'AUPSAllergyIntolerance',
           'http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-bundle' => 'AUPSBundle', 'http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-composition' => 'AUPSComposition', 'http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-condition' => 'AUPSCondition', 'http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-medicationrequest' => 'AUPSMedicationRequest', 'http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-medicationstatement' => 'AUPSMedicationStatement', 'http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-patient' => 'AUPSPatient' },

data/lib/au_ps_inferno/suite/au_ps_retrieve_cs_group/au_ps_cs_supports_ips_recommended_ops.rb

@@ -10,7 +10,7 @@ module AUPSTestKit
     id :au_ps_cs_supports_ips_recommended_ops_100preview
 
     run do
-      skip_if url.blank?, 'No FHIR server URL provided'
+      omit_if url.blank?, NO_SERVER_URL_OMIT_MESSAGE
       summary_op_defined?
       operation_defined?(operations, 'http://hl7.org/fhir/uv/ipa/OperationDefinition/docref', %w[docref],
                          :docref_op_defined)

data/lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/bundle_acquisition.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative 'suite_generate_au_ps_using_ips_summary_validation_tests_bundle_generate'
+
+module AUPSTestKit
+  # Automatically generated primitive group for Generate AU PS Bundle using $summary
+  class AUPSSuiteGenerateAuPsUsingIpsSummaryValidationTestsBundleAcquisition < Inferno::TestGroup
+    title 'Generate AU PS Bundle using $summary'
+    description 'Invokes the IPS $summary operation on the FHIR server and stores the returned Bundle for the validation tests in this group.'
+    id :suite_generate_au_ps_using_ips_summary_validation_tests_bundle_acquisition
+
+    run_as_group
+
+    test from: :suite_generate_au_ps_using_ips_summary_validation_tests_bundle_generate
+  end
+end

data/lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/bundle_validation/suite_generate_au_ps_using_ips_summary_validation_tests_bundle_validation_bundle_valid.rb

@@ -3,13 +3,11 @@
 require_relative '../../../utils/basic_test_class'
 require_relative '../../../utils/metadata_manager'
 
-require_relative '../../../utils/summary_valid_bundle_class'
-
-require_relative '../../../utils/ips_summary_valid_bundle_class'
+require_relative '../../../utils/bundle_is_valid_class'
 
 module AUPSTestKit
   # Automatically generated primitive test for Generated Bundle is valid against AU PS Bundle profile
-  class AUPSSuiteGenerateAuPsUsingIpsSummaryValidationTestsBundleValidationGeneratedBundleIsValidAgainstAuPsBundleProfile < SummaryValidBundleClass
+  class AUPSSuiteGenerateAuPsUsingIpsSummaryValidationTestsBundleValidationGeneratedBundleIsValidAgainstAuPsBundleProfile < BundleIsValidClass
     title 'Generated Bundle is valid against AU PS Bundle profile'
     description 'Verifies that a bundle produced by the IPS $summary operation conforms to the AU PS Bundle profile.'
     id :suite_generate_au_ps_using_ips_summary_validation_tests_bundle_validation_bundle_valid

data/lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/bundle_validation/suite_generate_au_ps_using_ips_summary_validation_tests_bundle_validation_bundle_valid_ips.rb

@@ -3,13 +3,11 @@
 require_relative '../../../utils/basic_test_class'
 require_relative '../../../utils/metadata_manager'
 
-require_relative '../../../utils/summary_valid_bundle_class'
-
-require_relative '../../../utils/ips_summary_valid_bundle_class'
+require_relative '../../../utils/ips_bundle_is_valid_class'
 
 module AUPSTestKit
   # Automatically generated primitive test for Generated Bundle is valid against IPS Bundle profile
-  class AUPSSuiteGenerateAuPsUsingIpsSummaryValidationTestsBundleValidationGeneratedBundleIsValidAgainstIpsBundleProfile < IpsSummaryValidBundleClass
+  class AUPSSuiteGenerateAuPsUsingIpsSummaryValidationTestsBundleValidationGeneratedBundleIsValidAgainstIpsBundleProfile < IpsBundleIsValidClass
     title 'Generated Bundle is valid against IPS Bundle profile'
     description 'Verifies that a bundle produced by the IPS $summary operation conforms to the IPS Bundle profile.'
     id :suite_generate_au_ps_using_ips_summary_validation_tests_bundle_validation_bundle_valid_ips

data/lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/generate_au_ps_using_ips_summary_validation_tests.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'bundle_acquisition'
+
 require_relative 'bundle_validation'
 
 require_relative 'au_ps_bundle_must_support_conformance'
@@ -31,6 +33,8 @@ module AUPSTestKit
 
     run_as_group
 
+    group from: :suite_generate_au_ps_using_ips_summary_validation_tests_bundle_acquisition
+
     group from: :suite_generate_au_ps_using_ips_summary_validation_tests_bundle_validation
 
     group from: :suite_generate_au_ps_using_ips_summary_validation_tests_au_ps_bundle_must_support_conformance

data/lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/suite_generate_au_ps_using_ips_summary_validation_tests_bundle_generate.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative '../../utils/basic_test_class'
+require_relative '../../utils/metadata_manager'
+
+require_relative '../../utils/generate_summary_bundle_test_class'
+
+module AUPSTestKit
+  # Automatically generated primitive test for Patient summary Bundle is generated by the IPS $summary operation
+  class AUPSSuiteGenerateAuPsUsingIpsSummaryValidationTestsBundleValidationGenerateAuPsBundleUsingTheIpsSummaryOperation < GenerateSummaryBundleTestClass
+    title 'Patient summary Bundle is generated by the IPS $summary operation'
+    description 'The IPS $summary operation returns HTTP 200 with a Bundle. The generated Bundle is stored for ' \
+                'the validation tests in this group.'
+    id :suite_generate_au_ps_using_ips_summary_validation_tests_bundle_generate
+
+    def metadata_manager
+      @metadata_manager ||= MetadataManager.new(File.expand_path('../../metadata.yaml', __dir__))
+    end
+  end
+end

data/lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/bundle_acquisition.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative 'suite_retrieve_au_ps_bundle_validation_tests_bundle_retrieve'
+
+module AUPSTestKit
+  # Automatically generated primitive group for Retrieve AU PS Bundle
+  class AUPSSuiteRetrieveAuPsBundleValidationTestsBundleAcquisition < Inferno::TestGroup
+    title 'Retrieve AU PS Bundle'
+    description 'Retrieves the document Bundle using a Bundle read interaction or a direct HTTP GET request and stores it for the validation tests in this group.'
+    id :suite_retrieve_au_ps_bundle_validation_tests_bundle_acquisition
+
+    run_as_group
+
+    test from: :suite_retrieve_au_ps_bundle_validation_tests_bundle_retrieve
+  end
+end

data/lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/bundle_validation/suite_retrieve_au_ps_bundle_validation_tests_bundle_validation_bundle_valid.rb

@@ -3,15 +3,13 @@
 require_relative '../../../utils/basic_test_class'
 require_relative '../../../utils/metadata_manager'
 
-require_relative '../../../utils/retrieve_bundle_test_class'
-
-require_relative '../../../utils/ips_retrieve_bundle_test_class'
+require_relative '../../../utils/bundle_is_valid_class'
 
 module AUPSTestKit
   # Automatically generated primitive test for Retrieved Bundle is valid against AU PS Bundle profile
-  class AUPSSuiteRetrieveAuPsBundleValidationTestsBundleValidationRetrievedBundleIsValidAgainstAuPsBundleProfile < RetrieveBundleTestClass
+  class AUPSSuiteRetrieveAuPsBundleValidationTestsBundleValidationRetrievedBundleIsValidAgainstAuPsBundleProfile < BundleIsValidClass
     title 'Retrieved Bundle is valid against AU PS Bundle profile'
-    description 'Verifies that a bundle retrieved from the server conforms to the AU PS Bundle profile.'
+    description 'Verifies that the bundle retrieved from the server conforms to the AU PS Bundle profile.'
     id :suite_retrieve_au_ps_bundle_validation_tests_bundle_validation_bundle_valid
 
     def metadata_manager

data/lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/bundle_validation/suite_retrieve_au_ps_bundle_validation_tests_bundle_validation_bundle_valid_ips.rb

@@ -3,15 +3,13 @@
 require_relative '../../../utils/basic_test_class'
 require_relative '../../../utils/metadata_manager'
 
-require_relative '../../../utils/retrieve_bundle_test_class'
-
-require_relative '../../../utils/ips_retrieve_bundle_test_class'
+require_relative '../../../utils/ips_bundle_is_valid_class'
 
 module AUPSTestKit
   # Automatically generated primitive test for Retrieved Bundle is valid against IPS Bundle profile
-  class AUPSSuiteRetrieveAuPsBundleValidationTestsBundleValidationRetrievedBundleIsValidAgainstIpsBundleProfile < IpsRetrieveBundleTestClass
+  class AUPSSuiteRetrieveAuPsBundleValidationTestsBundleValidationRetrievedBundleIsValidAgainstIpsBundleProfile < IpsBundleIsValidClass
     title 'Retrieved Bundle is valid against IPS Bundle profile'
-    description 'Verifies that a bundle retrieved from the server conforms to the IPS Bundle profile.'
+    description 'Verifies that the bundle retrieved from the server conforms to the IPS Bundle profile.'
     id :suite_retrieve_au_ps_bundle_validation_tests_bundle_validation_bundle_valid_ips
 
     def metadata_manager

data/lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/retrieve_au_ps_bundle_validation_tests.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'bundle_acquisition'
+
 require_relative 'bundle_validation'
 
 require_relative 'au_ps_bundle_must_support_conformance'
@@ -31,6 +33,8 @@ module AUPSTestKit
 
     run_as_group
 
+    group from: :suite_retrieve_au_ps_bundle_validation_tests_bundle_acquisition
+
     group from: :suite_retrieve_au_ps_bundle_validation_tests_bundle_validation
 
     group from: :suite_retrieve_au_ps_bundle_validation_tests_au_ps_bundle_must_support_conformance

data/lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/suite_retrieve_au_ps_bundle_validation_tests_bundle_retrieve.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../../utils/basic_test_class'
+require_relative '../../utils/metadata_manager'
+
+require_relative '../../utils/retrieve_bundle_test_class'
+
+module AUPSTestKit
+  # Automatically generated primitive test for Bundle is retrievable from the FHIR server
+  class AUPSSuiteRetrieveAuPsBundleValidationTestsBundleValidationRetrieveAuPsBundleFromTheFhirServer < RetrieveBundleTestClass
+    title 'Bundle is retrievable from the FHIR server'
+    description 'A Bundle can be retrieved via a Bundle read interaction (FHIR server URL and Bundle ID) or a ' \
+                'direct HTTP GET of the Bundle URL, returning HTTP 200 with a parsable FHIR Bundle. The ' \
+                'retrieved Bundle is stored for the validation tests in this group.'
+    id :suite_retrieve_au_ps_bundle_validation_tests_bundle_retrieve
+
+    def metadata_manager
+      @metadata_manager ||= MetadataManager.new(File.expand_path('../../metadata.yaml', __dir__))
+    end
+  end
+end

data/lib/au_ps_inferno/utils/attester/basic_test_attester_identifier_slices.rb

@@ -19,7 +19,7 @@ module AUPSTestKit
     end
 
     def test_composition_attester_party_ms_identifier_slices
-      check_bundle_exists_in_scratch
+      omit_unless_bundle_in_scratch
       resource = attester_party_resource
       skip_if resource.blank?, 'Attester or attester.party is not populated'
 

data/lib/au_ps_inferno/utils/attester/basic_test_attester_resource.rb

@@ -8,10 +8,11 @@ module AUPSTestKit
     def attester_party_resource
       return nil unless scratch_bundle.present?
 
-      ref_str = attester_party_ref_from_bundle(BundleDecorator.new(scratch_bundle))
+      bundle_resource = BundleDecorator.new(scratch_bundle)
+      ref_str = attester_party_ref_from_bundle(bundle_resource)
       return nil if ref_str.blank?
 
-      bundle_entity_resource_from_scratch(ref_str)
+      bundle_resource.resource_by_reference(ref_str)
     end
 
     private

data/lib/au_ps_inferno/utils/author/basic_test_author_resource.rb

@@ -18,7 +18,7 @@ module AUPSTestKit
       ref_str = author_ref.respond_to?(:reference) ? author_ref.reference : author_ref['reference']
       return nil if ref_str.blank?
 
-      bundle_entity_resource_from_scratch(ref_str)
+      bundle_resource.resource_by_reference(ref_str)
     end
 
     private

data/lib/au_ps_inferno/utils/basic_test/bundle_module.rb

@@ -6,7 +6,7 @@ module AUPSTestKit
   # Bundle-level checks, mandatory MS list info, and IPS bundle profile validation.
   module BasicTestBundleModule
     def bundle_mandatory_ms_elements_info
-      check_bundle_exists_in_scratch
+      omit_unless_bundle_in_scratch
       passed = [identifier_info?, type_info?, timestamp_info?, all_entries_have_full_url_info?].all?
       message_type = passed ? 'info' : 'error'
       add_message(message_type,
@@ -39,7 +39,7 @@ module AUPSTestKit
     private
 
     def validate_bundle_wrapper(profile_with_version)
-      check_bundle_exists_in_scratch
+      omit_unless_bundle_in_scratch
       validate_bundle(
         scratch_bundle,
         profile_with_version

data/lib/au_ps_inferno/utils/basic_test/capability_operations_module.rb

@@ -8,9 +8,12 @@ module AUPSTestKit
         operation.definition == op_def_url || names_arr.include?(operation.name.downcase)
       end
 
-      message_base = 'Server CapabilityStatement declares support for operation with operation definition'
-
-      info "#{message_base} #{op_def_url}: #{boolean_to_existent_string(operation_defined)}"
+      if operation_defined
+        info "Server CapabilityStatement declares support for operation #{op_def_url}: ✅ Declared"
+      else
+        info "Server CapabilityStatement does not declare support for operation #{op_def_url}. " \
+             'This operation is not required by AU PS; this message is informational only.'
+      end
 
       scratch[scratch_key] = operation_defined
     end

data/lib/au_ps_inferno/utils/basic_test/composition_elements_and_slices_module.rb

@@ -6,6 +6,7 @@ module AUPSTestKit
     private
 
     def validate_populated_elements_in_composition(elements_array, required: true)
+      omit_unless_bundle_in_scratch
       composition_resource = composition_resource_from_scratch
       return false unless composition_resource.present?
 
@@ -31,6 +32,7 @@ module AUPSTestKit
     end
 
     def validate_populated_slices_in_composition(slices_array)
+      omit_unless_bundle_in_scratch
       return false unless scratch_bundle.present?
 
       composition_resource = BundleDecorator.new(scratch_bundle).composition_resource

data/lib/au_ps_inferno/utils/basic_test/composition_section_read_module.rb

@@ -18,18 +18,18 @@ module AUPSTestKit
     private
 
     def test_composition_mandatory_sections
-      check_bundle_exists_in_scratch
+      omit_unless_bundle_in_scratch
       test_composition_sections_data(sections_codes: MANDATORY_SECTIONS_CODES, bundle_data: scratch_bundle,
                                      mandatory: true)
     end
 
     def test_composition_recommended_sections
-      check_bundle_exists_in_scratch
+      omit_unless_bundle_in_scratch
       test_composition_sections_data(sections_codes: RECOMMENDED_SECTIONS_CODES, bundle_data: scratch_bundle)
     end
 
     def test_composition_optional_sections
-      check_bundle_exists_in_scratch
+      omit_unless_bundle_in_scratch
       test_composition_sections_data(sections_codes: OPTIONAL_SECTIONS_CODES, bundle_data: scratch_bundle)
     end
 

data/lib/au_ps_inferno/utils/basic_test/composition_subelements_module.rb

@@ -6,6 +6,7 @@ module AUPSTestKit
     private
 
     def validate_populated_sub_elements_in_composition(mandatory_ms, optional_ms)
+      omit_unless_bundle_in_scratch
       composition_resource = composition_resource_from_scratch
       return false unless composition_resource.present?
 

data/lib/au_ps_inferno/utils/basic_test/resolve_resource_type_module.rb

@@ -4,6 +4,7 @@ module AUPSTestKit
   # Resolves the resource type from a resource. This module is used in tests for subject, author, custodian, attester.
   module BasicTestResolveResourceTypeModule
     def test_resource_type_is_valid?(container_type)
+      omit_unless_bundle_in_scratch
       result = raw_resource_type_is_valid(container_type)
       valid = result[:valid?]
       result_msg = result[:msg]

data/lib/au_ps_inferno/utils/basic_test/resource_helpers_module.rb

@@ -116,6 +116,7 @@ module AUPSTestKit
     end
 
     def guard_populated_resource(container_type)
+      omit_unless_bundle_in_scratch
       resource_is_poluated = raw_resource_type_is_valid(container_type)
       skip_if !resource_is_poluated[:valid?], resource_is_poluated[:msg]
     end

data/lib/au_ps_inferno/utils/basic_test/section_bundle_validation_module.rb

@@ -6,7 +6,7 @@ module AUPSTestKit
     private
 
     def validate_populated_undefined_sections_in_bundle(sections_code_to_filter, elements_array)
-      skip_if scratch_bundle.blank?, 'No Bundle resource provided'
+      omit_unless_bundle_in_scratch
 
       bundle_resource = BundleDecorator.new(scratch_bundle)
       sections_to_validate = bundle_resource.composition_resource.section_codes.filter do |section_code|
@@ -18,7 +18,7 @@ module AUPSTestKit
     end
 
     def validate_populated_sections_in_bundle(section_codes_array, elements_array, optional: false)
-      skip_if scratch_bundle.blank?, 'No Bundle resource provided'
+      omit_unless_bundle_in_scratch
       skip_if section_codes_array.blank?, 'No sections to validate'
 
       composition = BundleDecorator.new(scratch_bundle).composition_resource

data/lib/au_ps_inferno/utils/basic_test_class.rb

@@ -20,7 +20,6 @@ require_relative 'basic_test/ms_identifier_slices_module'
 require_relative 'basic_test/composition_elements_and_slices_module'
 require_relative 'basic_test/section_bundle_validation_module'
 require_relative 'basic_test/resolve_path_debug_module'
-require_relative 'basic_test/scratch_bundle_entries_module'
 require_relative 'basic_test/ms_elements_populated_module'
 require_relative 'basic_test/ms_sub_elements_populated_module'
 require_relative 'basic_test/resolve_resource_type_module'
@@ -48,7 +47,6 @@ module AUPSTestKit
     include BasicTestCompositionElementsAndSlicesModule
     include BasicTestSectionBundleValidationModule
     include BasicTestResolvePathDebugModule
-    include BasicTestScratchBundleEntriesModule
     include BasicTestMsElementsPopulatedModule
     include BasicTestMsSubElementsPopulatedModule
     include BasicTestResolveResourceTypeModule

data/lib/au_ps_inferno/utils/basic_test_contants_module.rb

@@ -2,6 +2,7 @@
 
 module AUPSTestKit
   module BasicTestConstants
+    NO_SERVER_URL_OMIT_MESSAGE = 'No FHIR server URL was provided, so this test group is omitted.'
     # AU PS Patient Must Support identifier slices (optional). System URLs for IHI, DVA, Medicare.
     PATIENT_MS_IDENTIFIER_SLICES = [
       { name: 'IHI', system: 'http://ns.electronichealth.net.au/id/hi/ihi/1.0' },

data/lib/au_ps_inferno/utils/basic_validate_bundle_test.rb

@@ -3,8 +3,10 @@
 module AUPSTestKit
   # Basic test for validating a Bundle resource against the AU PS Bundle or IPS Bundle profile
   class BasicValidateBundleTest < BasicTest
-    OMIT_AU_PS_MESSAGE = 'Validation against AU PS Bundle is disabled'
-    OMIT_IPS_MESSAGE = 'Validation against IPS Bundle is disabled'
+    OMIT_AU_PS_MESSAGE = 'Validation against the AU PS Bundle profile is disabled because "AU PS Bundle ' \
+                         'Validation" is not selected in the "Validate Against" input.'
+    OMIT_IPS_MESSAGE = 'Validation against the IPS Bundle profile is disabled because "IPS Bundle ' \
+                       'Validation" is not selected in the "Validate Against" input.'
 
     id :basic_validate_bundle_test
 

data/lib/au_ps_inferno/utils/bundle_is_valid_class.rb

@@ -3,27 +3,12 @@
 require_relative 'basic_validate_bundle_test'
 
 module AUPSTestKit
-  # The Bundle resource is valid against the AU PS Bundle profile
+  # The Bundle loaded by this test group is valid against the AU PS Bundle profile
   class BundleIsValidClass < BasicValidateBundleTest
     id :bundle_is_valid_class_test
-    input :bundle_resource,
-          optional: true,
-          description: 'If you want to check existing Bundle resource',
-          type: 'textarea'
-
-    def skip_test?
-      bundle_resource.blank?
-    end
-
-    def read_and_save_data
-      resource = FHIR.from_contents(bundle_resource)
-      scratch[:bundle_ips_resource] = resource
-      save_bundle_entities_to_scratch(scratch_bundle)
-    end
 
     run do
-      skip_if skip_test?, 'No Bundle resource provided'
-      read_and_save_data
+      omit_unless_bundle_in_scratch
       omit_if omit_au_ps_validation?, OMIT_AU_PS_MESSAGE
       validate_au_ps_bundle
     end

data/lib/au_ps_inferno/utils/composition_utils.rb

@@ -7,12 +7,33 @@ require_relative 'composition_utils/boolean_and_stats'
 module CompositionUtils
   include CompositionUtilsBooleanAndStats
 
+  NO_BUNDLE_OMIT_MESSAGE = 'No AU PS Bundle was loaded by this test group (its inputs were not provided or ' \
+                           'the Bundle could not be acquired), so this test is omitted.'
+
+  # Each top-level group keeps its Bundle under its own scratch key so that a
+  # group can never validate a Bundle acquired by a different group.
+  BUNDLE_SOURCE_GROUPS = {
+    'retrieve_au_ps_bundle_validation_tests' => 'retrieve',
+    'generate_au_ps_using_ips_summary_validation_tests' => 'summary',
+    'au_ps_bundle_instance' => 'instance'
+  }.freeze
+
+  def bundle_scratch_key
+    id_str = self.class.id.to_s
+    _slug, source = BUNDLE_SOURCE_GROUPS.find { |slug, _| id_str.include?(slug) }
+    source ? :"bundle_ips_resource_#{source}" : :bundle_ips_resource
+  end
+
   def scratch_bundle
-    scratch[:bundle_ips_resource]
+    scratch[bundle_scratch_key]
+  end
+
+  def save_bundle_to_scratch(bundle)
+    scratch[bundle_scratch_key] = bundle
   end
 
-  def check_bundle_exists_in_scratch
-    skip_if scratch_bundle.blank?, 'No Bundle resource provided'
+  def omit_unless_bundle_in_scratch
+    omit_if scratch_bundle.blank?, NO_BUNDLE_OMIT_MESSAGE
   end
 
   def group_section_output(section_info_array)

data/lib/au_ps_inferno/utils/custodian/basic_test_custodian_resource.rb

@@ -18,7 +18,7 @@ module AUPSTestKit
       ref_str = custodian_ref.respond_to?(:reference) ? custodian_ref.reference : custodian_ref['reference']
       return nil if ref_str.blank?
 
-      bundle_entity_resource_from_scratch(ref_str)
+      bundle_resource.resource_by_reference(ref_str)
     end
 
     private

data/lib/au_ps_inferno/utils/custodian/basic_test_custodian_tests.rb

@@ -8,7 +8,7 @@ module AUPSTestKit
     include BasicTestConstants
 
     def test_composition_custodian_ms_identifier_slices
-      check_bundle_exists_in_scratch
+      omit_unless_bundle_in_scratch
       resource = custodian_resource
       skip_if resource.blank?, 'Custodian is not populated'
 

data/lib/au_ps_inferno/utils/{summary_valid_bundle_class.rb → generate_summary_bundle_test_class.rb}

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'net/http'
-require 'uri'
-
-require_relative 'basic_validate_bundle_test'
+require_relative 'basic_test_class'
 
 module AUPSTestKit
-  # The Bundle resource is valid against the AU PS Bundle profile
-  class SummaryValidBundleClass < BasicValidateBundleTest
-    id :summary_valid_bundle_class_test
+  # Generates a Bundle via the IPS $summary operation into the group's scratch space
+  class GenerateSummaryBundleTestClass < BasicTest
+    id :generate_summary_bundle_test_class
     input_order :url, :patient_id, :identifier, :profile, :credentials, :header_name, :header_value
 
+    NO_SUMMARY_INPUTS_MESSAGE = 'No FHIR server URL with patient id or patient identifier was provided, ' \
+                                'so this test group is omitted.'
+
     input :url,
           title: 'FHIR Server Base Url',
           optional: true
@@ -68,17 +68,12 @@ module AUPSTestKit
       assert_response_status(200)
       assert_resource_type(:bundle)
       resource_from_request = FHIR.from_contents(response.response_body)
-      scratch[:bundle_ips_resource] = resource_from_request
-      save_bundle_entities_to_scratch(scratch_bundle)
+      save_bundle_to_scratch(resource_from_request)
     end
 
     run do
-      skip_if url.blank?, 'No FHIR server specified'
-      summary_op_defined? if scratch[:summary_op_defined].blank?
-      skip_if scratch[:summary_op_defined] == false, 'Server does not declare support for $summary operation'
+      omit_if skip_test?, NO_SUMMARY_INPUTS_MESSAGE
       read_and_save_data
-      omit_if omit_au_ps_validation?, OMIT_AU_PS_MESSAGE
-      validate_au_ps_bundle
     end
   end
 end

data/lib/au_ps_inferno/utils/provided_bundle_test_class.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative 'basic_test_class'
+
+module AUPSTestKit
+  # Loads a Bundle pasted as text into the group's scratch space
+  class ProvidedBundleTestClass < BasicTest
+    id :provided_bundle_test_class
+
+    NO_PROVIDED_BUNDLE_MESSAGE = 'No Bundle resource was provided, so this test group is omitted.'
+
+    input :bundle_resource,
+          optional: true,
+          description: 'If you want to check existing Bundle resource',
+          type: 'textarea'
+
+    def parse_bundle_resource
+      FHIR.from_contents(bundle_resource)
+    rescue StandardError
+      nil
+    end
+
+    run do
+      omit_if bundle_resource.blank?, NO_PROVIDED_BUNDLE_MESSAGE
+      resource = parse_bundle_resource
+      assert resource.present?, 'The provided text could not be parsed as a FHIR resource'
+      assert resource.resourceType == 'Bundle',
+             "The provided resource is a #{resource.resourceType}, expected a Bundle"
+      save_bundle_to_scratch(resource)
+    end
+  end
+end

data/lib/au_ps_inferno/utils/retrieve_bundle_test_class.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'net/http'
-require 'uri'
-
-require_relative 'basic_validate_bundle_test'
+require_relative 'basic_test_class'
 
 module AUPSTestKit
-  # A base class for all tests that retrieve a Bundle resource
-  class RetrieveBundleTestClass < BasicValidateBundleTest
+  # Retrieves a Bundle from a FHIR server (or a direct URL) into the group's scratch space
+  class RetrieveBundleTestClass < BasicTest
     id :retrieve_bundle_test_class
     input_order :bundle_url, :url, :bundle_id, :credentials, :header_name, :header_value
 
+    NO_RETRIEVAL_INPUTS_MESSAGE = 'No FHIR server URL with Bundle ID, and no Bundle URL, were provided, ' \
+                                  'so this test group is omitted.'
+
     input :bundle_id,
           optional: true,
           description: 'To request Bundle/{bundle_id}'
@@ -46,17 +46,27 @@ module AUPSTestKit
       fhir_read(:bundle, bundle_id)
       assert_response_status(200)
       assert_resource_type(:bundle)
-      scratch[:bundle_ips_resource] = resource
+      save_bundle_to_scratch(resource)
     end
 
     def get_bundle_resource_from_url(bundle_url)
-      uri = URI(bundle_url)
-      response = Net::HTTP.get_response(uri)
-      assert response.code == '200', "Bundle resource not found at #{bundle_url}"
-      bundle_resource = FHIR.from_contents(response.body)
-      assert bundle_resource.resourceType == 'Bundle', 'Resource have different type than Bundle'
-      scratch[:bundle_ips_resource] = bundle_resource
-      save_bundle_entities_to_scratch(scratch_bundle)
+      get(bundle_url, headers: extra_headers)
+      assert_response_status(200)
+      bundle_resource = parse_bundle(request.response_body)
+      assert bundle_resource.present?, "The response from #{bundle_url} could not be parsed as a FHIR resource"
+      assert bundle_resource.resourceType == 'Bundle',
+             "The resource at #{bundle_url} is a #{bundle_resource.resourceType}, expected a Bundle"
+      save_bundle_to_scratch(bundle_resource)
+    end
+
+    def extra_headers
+      header_name.present? && header_value.present? ? { header_name => header_value } : {}
+    end
+
+    def parse_bundle(body)
+      FHIR.from_contents(body)
+    rescue StandardError
+      nil
     end
 
     def skip_test?
@@ -65,17 +75,15 @@ module AUPSTestKit
 
     def read_and_save_data
       if url.present? && bundle_id.present?
-        get_bundle_resource_from_fhir_server(bundle_id) if url.present? && bundle_id.present?
+        get_bundle_resource_from_fhir_server(bundle_id)
       elsif bundle_url.present?
         get_bundle_resource_from_url(bundle_url)
       end
     end
 
     run do
-      skip_if skip_test?, 'There is no FHIR server URL, Bundle ID or Bundle URL provided'
+      omit_if skip_test?, NO_RETRIEVAL_INPUTS_MESSAGE
       read_and_save_data
-      omit_if omit_au_ps_validation?, OMIT_AU_PS_MESSAGE
-      validate_au_ps_bundle
     end
   end
 end

data/lib/au_ps_inferno/utils/subject/basic_test_subject_resource.rb

@@ -15,7 +15,7 @@ module AUPSTestKit
       subject = composition_resource.subject
       return false unless subject.present?
 
-      bundle_entity_resource_from_scratch(subject.reference)
+      bundle_resource.resource_by_reference(subject.reference)
     end
   end
 end

data/lib/au_ps_inferno/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module AUPSTestKit
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
   IG_VERSION = '1.0.0'
 end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: au_ps_inferno
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ilya Beda
 - Pavel Rozhkov
+- Kyle Pettigrew
 autorequire:
 bindir: bin
 cert_chain: []
@@ -85,6 +86,7 @@ description: AU PS Inferno Test Kit
 email:
 - ilya@beda.software
 - pavel.r@beda.software
+- kyle.pettigrew@csiro.au
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -136,9 +138,11 @@ files:
 - lib/au_ps_inferno/suite/au_ps_bundle_instance/au_ps_composition_subject/suite_au_ps_bundle_instance_au_ps_composition_subject_subject_resource_type_is_valid.rb
 - lib/au_ps_inferno/suite/au_ps_bundle_instance/au_ps_composition_undefined_sections.rb
 - lib/au_ps_inferno/suite/au_ps_bundle_instance/au_ps_composition_undefined_sections/suite_au_ps_bundle_instance_au_ps_composition_undefined_sections_sections_may_undefined.rb
+- lib/au_ps_inferno/suite/au_ps_bundle_instance/bundle_acquisition.rb
 - lib/au_ps_inferno/suite/au_ps_bundle_instance/bundle_validation.rb
 - lib/au_ps_inferno/suite/au_ps_bundle_instance/bundle_validation/suite_au_ps_bundle_instance_bundle_validation_bundle_valid.rb
 - lib/au_ps_inferno/suite/au_ps_bundle_instance/bundle_validation/suite_au_ps_bundle_instance_bundle_validation_bundle_valid_ips.rb
+- lib/au_ps_inferno/suite/au_ps_bundle_instance/suite_au_ps_bundle_instance_bundle_provide.rb
 - lib/au_ps_inferno/suite/au_ps_retrieve_cs_group/au_ps_cs_is_valid_test.rb
 - lib/au_ps_inferno/suite/au_ps_retrieve_cs_group/au_ps_cs_supports_au_ps_profiles.rb
 - lib/au_ps_inferno/suite/au_ps_retrieve_cs_group/au_ps_cs_supports_ips_recommended_ops.rb
@@ -180,10 +184,12 @@ files:
 - lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/au_ps_composition_subject/composition_subject_subject_resource_type_is_valid.rb
 - lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/au_ps_composition_undefined_sections.rb
 - lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/au_ps_composition_undefined_sections/composition_undefined_sections_sections_may_undefined.rb
+- lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/bundle_acquisition.rb
 - lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/bundle_validation.rb
 - lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/bundle_validation/suite_generate_au_ps_using_ips_summary_validation_tests_bundle_validation_bundle_valid.rb
 - lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/bundle_validation/suite_generate_au_ps_using_ips_summary_validation_tests_bundle_validation_bundle_valid_ips.rb
 - lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/generate_au_ps_using_ips_summary_validation_tests.rb
+- lib/au_ps_inferno/suite/generate_au_ps_using_ips_summary_validation_tests/suite_generate_au_ps_using_ips_summary_validation_tests_bundle_generate.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/au_ps_bundle_must_support_conformance.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/au_ps_bundle_must_support_conformance/bundle_must_support_conformance_bundle_must_support_populated.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/au_ps_composition_attester.rb
@@ -220,10 +226,12 @@ files:
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/au_ps_composition_subject/suite_retrieve_au_ps_bundle_validation_tests_au_ps_composition_subject_subject_ms_elements.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/au_ps_composition_undefined_sections.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/au_ps_composition_undefined_sections/composition_undefined_sections_sections_may_undefined.rb
+- lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/bundle_acquisition.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/bundle_validation.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/bundle_validation/suite_retrieve_au_ps_bundle_validation_tests_bundle_validation_bundle_valid.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/bundle_validation/suite_retrieve_au_ps_bundle_validation_tests_bundle_validation_bundle_valid_ips.rb
 - lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/retrieve_au_ps_bundle_validation_tests.rb
+- lib/au_ps_inferno/suite/retrieve_au_ps_bundle_validation_tests/suite_retrieve_au_ps_bundle_validation_tests_bundle_retrieve.rb
 - lib/au_ps_inferno/utils/attester/basic_test_attester_identifier_slices.rb
 - lib/au_ps_inferno/utils/attester/basic_test_attester_message_helpers.rb
 - lib/au_ps_inferno/utils/attester/basic_test_attester_module.rb
@@ -246,7 +254,6 @@ files:
 - lib/au_ps_inferno/utils/basic_test/resolve_path_debug_module.rb
 - lib/au_ps_inferno/utils/basic_test/resolve_resource_type_module.rb
 - lib/au_ps_inferno/utils/basic_test/resource_helpers_module.rb
-- lib/au_ps_inferno/utils/basic_test/scratch_bundle_entries_module.rb
 - lib/au_ps_inferno/utils/basic_test/section_bundle_validation_module.rb
 - lib/au_ps_inferno/utils/basic_test_class.rb
 - lib/au_ps_inferno/utils/basic_test_contants_module.rb
@@ -263,11 +270,11 @@ files:
 - lib/au_ps_inferno/utils/custodian/basic_test_custodian_module.rb
 - lib/au_ps_inferno/utils/custodian/basic_test_custodian_resource.rb
 - lib/au_ps_inferno/utils/custodian/basic_test_custodian_tests.rb
+- lib/au_ps_inferno/utils/generate_summary_bundle_test_class.rb
 - lib/au_ps_inferno/utils/inferno_suite_generator_compat.rb
 - lib/au_ps_inferno/utils/ips_bundle_is_valid_class.rb
-- lib/au_ps_inferno/utils/ips_retrieve_bundle_test_class.rb
-- lib/au_ps_inferno/utils/ips_summary_valid_bundle_class.rb
 - lib/au_ps_inferno/utils/metadata_manager.rb
+- lib/au_ps_inferno/utils/provided_bundle_test_class.rb
 - lib/au_ps_inferno/utils/retrieve_bundle_test_class.rb
 - lib/au_ps_inferno/utils/rich_message_class.rb
 - lib/au_ps_inferno/utils/rich_validation_message.rb
@@ -279,7 +286,6 @@ files:
 - lib/au_ps_inferno/utils/subject/basic_test_subject_module.rb
 - lib/au_ps_inferno/utils/subject/basic_test_subject_patient_ms_other_tests.rb
 - lib/au_ps_inferno/utils/subject/basic_test_subject_resource.rb
-- lib/au_ps_inferno/utils/summary_valid_bundle_class.rb
 - lib/au_ps_inferno/utils/validator_helpers.rb
 - lib/au_ps_inferno/version.rb
 homepage: https://github.com/hl7au/au-ps-inferno

data/lib/au_ps_inferno/utils/basic_test/scratch_bundle_entries_module.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module AUPSTestKit
-  # Saving and retrieving bundle entities from scratch.
-  module BasicTestScratchBundleEntriesModule
-    def save_bundle_entities_to_scratch(bundle)
-      scratch[:bundle_entities] = bundle.entry.map do |entry|
-        {
-          full_url: entry.fullUrl,
-          resource_type: entry.resource.resourceType,
-          resource: entry.resource
-        }
-      end
-    end
-
-    def bundle_entities_from_scratch
-      scratch[:bundle_entities] || []
-    end
-
-    def bundle_entity_from_scratch(full_url)
-      bundle_entities_from_scratch.find { |entity| entity[:full_url] == full_url }
-    end
-
-    def bundle_entity_resource_from_scratch(full_url)
-      return nil if bundle_entity_from_scratch(full_url).nil?
-
-      bundle_entity_from_scratch(full_url)[:resource]
-    end
-  end
-end

data/lib/au_ps_inferno/utils/ips_retrieve_bundle_test_class.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'retrieve_bundle_test_class'
-
-module AUPSTestKit
-  # Retrieve a bundle and validate against the IPS Bundle profile
-  class IpsRetrieveBundleTestClass < RetrieveBundleTestClass
-    id :ips_retrieve_bundle_test_class_base
-
-    run do
-      skip_if skip_test?, 'There is no FHIR server URL, Bundle ID or Bundle URL provided'
-      read_and_save_data
-      omit_if omit_ips_validation?, OMIT_IPS_MESSAGE
-      validate_ips_bundle
-    end
-  end
-end

data/lib/au_ps_inferno/utils/ips_summary_valid_bundle_class.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'summary_valid_bundle_class'
-
-module AUPSTestKit
-  # Bundle from $summary validated against the IPS Bundle profile
-  class IpsSummaryValidBundleClass < SummaryValidBundleClass
-    id :ips_summary_valid_bundle_class_base
-
-    run do
-      omit_if omit_ips_validation?, OMIT_IPS_MESSAGE
-      validate_ips_bundle
-    end
-  end
-end