subscriptions_test_kit 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad5fae1148d468463f60e61a0e7c273b90eac5294b1c8d19b588288d3d53ca77
-  data.tar.gz: 62507f2c4a5cc9e39c1906bbb10032d1baa00b8ec33055762016c5ce2d22722c
+  metadata.gz: 5a807454f459add0f7fd19401c70a5a3c190c5003c375c0b4eefe1e4103c8410
+  data.tar.gz: e284a813940aed69d0cfb3dffef7f1ab034c2fbf799182fe5b200d7edcb1285d
 SHA512:
-  metadata.gz: bad58bc3cdcb1c451bcb28f5dfbe8a5492e5cc8fff49b00f99d35d93588cec7936feeedee3c24984d6c1090ade8f92b35da4c89d83fd8036586f539cd0296ad7
-  data.tar.gz: f26d5875e051b95b24dabc7f45cdba4b9bda8631f76f022aa1e753569e89be8fd264b052ac9662855023c2f685ad9b4ac5473732b8d7538b32d7a2db819e2e6b
+  metadata.gz: 248c63937da747106d20cbb41dbfd80728de783757a322160882d651ef7f43c30b4192fdf83f036803ef8e50eae082348284fcd30c3e537ae99385df080baf68
+  data.tar.gz: 89d5e860a4fa25b362d5a5d55054ec729dfd4395aa09d453bf71123c7b381120a0510509ad6fea2803665931ccd515c844f652442c1c6b8965b58a4fc6f6a0d6

data/lib/subscriptions_test_kit/common/notification_conformance_verification.rb

@@ -150,8 +150,14 @@ module SubscriptionsTestKit
     end
 
     def check_bundle_entry_reference(bundle_entries, reference)
+      check_full_url = reference.start_with?('urn:')
+
       referenced_entry = bundle_entries.find do |entry|
-        reference.include?("#{entry.resource.resourceType}/#{entry.resource.id}")
+        if check_full_url
+          reference == entry.fullUrl
+        else
+          reference.include?("#{entry.resource.resourceType}/#{entry.resource.id}")
+        end
       end
       referenced_entry.present?
     end
@@ -226,15 +232,6 @@ module SubscriptionsTestKit
           resource in the entry.resource element.))
     end
 
-    def subscription_criteria(subscription)
-      return unless subscription['_criteria']
-
-      criteria_extension = subscription['_criteria']['extension'].find do |ext|
-        ext['url'].ends_with?('/backport-filter-criteria')
-      end
-      criteria_extension['valueString'].split('?').first
-    end
-
     def empty_event_notification_verification(notification_bundle)
       assert_valid_json(notification_bundle)
       bundle = FHIR.from_contents(notification_bundle)

data/lib/subscriptions_test_kit/common/subscription_conformance_verification.rb

@@ -37,6 +37,13 @@ module SubscriptionsTestKit
       end
     end
 
+    def valid_url?(url)
+      uri = URI.parse(url)
+      uri.is_a?(URI::HTTP) && !uri.host.nil?
+    rescue URI::InvalidURIError
+      false
+    end
+
     def subscription_verification(subscription_resource)
       assert_valid_json(subscription_resource)
       subscription = JSON.parse(subscription_resource)
@@ -46,6 +53,11 @@ module SubscriptionsTestKit
         The `type` field on the Subscription resource must be set to `rest-hook`, the `#{subscription_channel['type']}`
         channel type is unsupported.))
 
+      unless subscription['criteria'].present? && valid_url?(subscription['criteria'])
+        add_message('error', %(
+                    'The `criteria` field SHALL be populated and contain the canonical URL for the Subscription Topic.'
+                    ))
+      end
       subscription_resource = FHIR.from_contents(subscription.to_json)
       assert_resource_type('Subscription', resource: subscription_resource)
       assert_valid_resource(resource: subscription_resource,
@@ -77,8 +89,8 @@ module SubscriptionsTestKit
           Added the Authorization header field with a Bearer token set to #{access_token} to the `header` field on the
           Subscription resource in order to connect successfully with the Inferno subscription channel.
         ))
-        subscription['header'] = [] unless subscription['header'].present?
-        subscription['header'].append("Authorization: Bearer #{access_token}")
+        subscription_channel['header'] = [] unless subscription_channel['header'].present?
+        subscription_channel['header'].append("Authorization: Bearer #{access_token}")
       end
       subscription['channel'] = subscription_channel
       subscription

data/lib/subscriptions_test_kit/docs/samples/Subscription_empty.json

@@ -11,7 +11,7 @@
     "_criteria" : {
       "extension" : [{
         "url" : "http://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition/backport-filter-criteria",
-        "valueString" : "Encounter?patient=Patient/123"
+        "valueString" : "Encounter.patient=Patient/123"
       }]
     },
     "channel" : {

data/lib/subscriptions_test_kit/docs/samples/Subscription_full-resource.json

@@ -11,7 +11,7 @@
     "_criteria" : {
       "extension" : [{
         "url" : "http://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition/backport-filter-criteria",
-        "valueString" : "Encounter?patient=Patient/123"
+        "valueString" : "Encounter.patient=Patient/123"
       }]
     },
     "channel" : {

data/lib/subscriptions_test_kit/docs/samples/Subscription_id-only.json

@@ -12,7 +12,7 @@
     "_criteria" : {
       "extension" : [{
         "url" : "http://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition/backport-filter-criteria",
-        "valueString" : "Encounter?patient=Patient/123"
+        "valueString" : "Encounter.patient=Patient/123"
       }]
     },
     "channel" : {

data/lib/subscriptions_test_kit/docs/subscriptions_r5_backport_r4_client_suite_description.md

@@ -117,4 +117,7 @@ Specific limitations to highlight include
   [provide feedback](https://github.com/inferno-framework/subscriptions-test-kit/issues) to that effect.
 - Inferno does not test delivery error handling and recovery scenarios, including
   the optional `$events` API and event numbering details.
-- Inferno does not support sending heartbeat notifications.
+- Inferno does not support sending heartbeat notifications.
+- Inferno does not verify that the shape and content of notifications are appropriate for the triggering
+  Subscription because those details, e.g., the resource types that can be a focus of the notification, 
+  are defined within the SubscriptionTopic which is not available in FHIR R4.

data/lib/subscriptions_test_kit/docs/subscriptions_r5_backport_r4_server_suite_description.md

@@ -167,4 +167,7 @@ Specific limitations to highlight include
   If there is a channel type that you would like to see verified, please 
   [provide feedback](https://github.com/inferno-framework/subscriptions-test-kit/issues) to that effect.
 - Inferno does not test delivery error handling and recovery scenarios, including
-  the optional `$events` API and event numbering details.
+  the optional `$events` API and event numbering details.
+- Inferno does not verify that the shape and content of notifications are appropriate for the triggering
+  Subscription because those details, e.g., the resource types that can be a focus of the notification, 
+  are defined within the SubscriptionTopic which is not available in FHIR R4.

data/lib/subscriptions_test_kit/endpoints/subscription_status_endpoint.rb

@@ -38,11 +38,12 @@ module SubscriptionsTestKit
 
       notification_json = notification_bundle_input(result)
       subscription_url = "#{base_subscription_url}/#{subscription.id}"
+      subscription_topic = subscription.criteria
       status_code = determine_subscription_status_code(subscription_id)
       event_count = determine_event_count(test_run.test_session_id)
       response.status = 200
-      response.body = derive_status_bundle(notification_json, subscription_url, status_code, event_count,
-                                           request.url).to_json
+      response.body = derive_status_bundle(notification_json, subscription_url, subscription_topic, status_code,
+                                           event_count, request.url).to_json
     end
 
     def subscription_params_match?(params)

data/lib/subscriptions_test_kit/jobs/send_subscription_notifications.rb

@@ -74,6 +74,10 @@ module SubscriptionsTestKit
         @authorization_header ||= @bearer_token.present? ? { 'Authorization' => "Bearer #{@bearer_token}" } : {}
       end
 
+      def subscription_topic
+        @subscription_topic ||= subscription&.criteria
+      end
+
       def test_still_waiting?
         results_repo.find_waiting_result(test_run_id: @test_run_id)
       end
@@ -83,14 +87,15 @@ module SubscriptionsTestKit
       end
 
       def send_handshake_notification
-        handshake_json = derive_handshake_notification(@notification_json, @subscription_url).to_json
+        handshake_json = derive_handshake_notification(@notification_json, @subscription_url,
+                                                       subscription_topic).to_json
         response = send_notification(handshake_json)
         persist_notification_request(response, [REST_HOOK_HANDSHAKE_NOTIFICATION_TAG])
         resume_inferno_test unless response.status == 200
       end
 
       def send_event_notification
-        event_json = derive_event_notification(@notification_json, @subscription_url, 1).to_json
+        event_json = derive_event_notification(@notification_json, @subscription_url, subscription_topic, 1).to_json
         response = send_notification(event_json)
         persist_notification_request(response, [REST_HOOK_EVENT_NOTIFICATION_TAG])
       end

data/lib/subscriptions_test_kit/requirements/generated/subscriptions-test-kit_requirements_coverage.csv

@@ -5,12 +5,12 @@ hl7.fhir.uv.subscriptions_1.1.0,4,https://hl7.org/fhir/uv/subscriptions-backport
 hl7.fhir.uv.subscriptions_1.1.0,7,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,"When a FHIR Server accepts a request to create a Subscription, the server is indicating to the client that the server:
  - is capable of detecting when events covered by the requested SubscriptionTopic occur, and
  - is willing to make a simple best effort attempt at delivering a notification for each occurrence of a matching event.",SHALL,Server,,,NA,NA,"1.1.03, 3.1.1.03, 3.2.1.03, 3.3.1.03","subscriptions_r5_backport_r4_server-subscriptions_r4_server_workflow-subscriptions_r4_server_interaction-subscriptions_r4_server_creation_response_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_empty_content-subscriptions_r4_server_empty_content_interaction-subscriptions_r4_server_creation_response_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_id_only_content-subscriptions_r4_server_id_only_content_interaction-subscriptions_r4_server_creation_response_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_full_resource_content-subscriptions_r4_server_full_resource_content_interaction-subscriptions_r4_server_creation_response_conformance"
-hl7.fhir.uv.subscriptions_1.1.0,8,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,When processing a request for a Subscription...a server SHOULD validate…that the SubscriptionTopic is valid and implemented by the server,SHOULD,Server,,,NA,NA,6.01,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscriptions
-hl7.fhir.uv.subscriptions_1.1.0,9,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,When processing a request for a Subscription...a server SHOULD validate…that all requested filters are defined in the requested topic and are implemented in the server,SHOULD,Server,,,NA,NA,6.01,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscriptions
-hl7.fhir.uv.subscriptions_1.1.0,10,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,When processing a request for a Subscription...a server SHOULD validate…that the channel type is known and implemented by the server,SHOULD,Server,,,NA,NA,6.01,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscriptions
-hl7.fhir.uv.subscriptions_1.1.0,11,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,"When processing a request for a Subscription...a server SHOULD validate…that the channel endpoint is valid for the channel provided (e.g., is it a valid URL of the expected type)",SHOULD,Server,,,NA,NA,6.01,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscriptions
-hl7.fhir.uv.subscriptions_1.1.0,12,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,When processing a request for a Subscription...a server SHOULD validate…that the payload configuration is known and implemented by the server,SHOULD,Server,,,NA,NA,6.01,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscriptions
-hl7.fhir.uv.subscriptions_1.1.0,13,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,"When processing a request for a Subscription...a server SHOULD validate…that the payload configuration is valid for the channel type requested (e.g., complies with the server’s security policy)",SHOULD,Server,,,NA,NA,6.01,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscriptions
+hl7.fhir.uv.subscriptions_1.1.0,8,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,When processing a request for a Subscription...a server SHOULD validate…that the SubscriptionTopic is valid and implemented by the server,SHOULD,Server,,,NA,NA,6.02,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscription_topic
+hl7.fhir.uv.subscriptions_1.1.0,9,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,When processing a request for a Subscription...a server SHOULD validate…that all requested filters are defined in the requested topic and are implemented in the server,SHOULD,Server,,,NA,NA,6.03,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscription_filter
+hl7.fhir.uv.subscriptions_1.1.0,10,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,When processing a request for a Subscription...a server SHOULD validate…that the channel type is known and implemented by the server,SHOULD,Server,,,NA,NA,6.04,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscription_channel_type
+hl7.fhir.uv.subscriptions_1.1.0,11,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,"When processing a request for a Subscription...a server SHOULD validate…that the channel endpoint is valid for the channel provided (e.g., is it a valid URL of the expected type)",SHOULD,Server,,,NA,NA,6.05,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscription_channel_endpoint
+hl7.fhir.uv.subscriptions_1.1.0,12,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,When processing a request for a Subscription...a server SHOULD validate…that the payload configuration is known and implemented by the server,SHOULD,Server,,,NA,NA,6.06,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscription_payload_type
+hl7.fhir.uv.subscriptions_1.1.0,13,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#accepting-subscription-requests,"When processing a request for a Subscription...a server SHOULD validate…that the payload configuration is valid for the channel type requested (e.g., complies with the server’s security policy)",SHOULD,Server,,,NA,NA,6.07,subscriptions_r5_backport_r4_server-subscriptions_r4_server_subscription_rejection-subscriptions_r4_server_reject_subscription_channel_payload_combo
 hl7.fhir.uv.subscriptions_1.1.0,14,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#subscription-notifications,"In ... FHIR R4 ... notifications are based on a history Bundle. The first entry always contains SubscriptionStatus information, encoded as ... a Parameters resource using the Backport SubscriptionStatus Profile in FHIR R4",SHALL,Server,,,NA,NA,"1.2.01, 3.1.2.01, 3.1.2.02, 3.2.2.01, 3.2.2.02, 3.3.2.01, 3.3.2.02, 4.01, 4.02","subscriptions_r5_backport_r4_server-subscriptions_r4_server_workflow-subscriptions_r4_server_interaction_verification-subscriptions_r4_server_notification_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_empty_content-subscriptions_r4_server_empty_content_interaction_verification-subscriptions_r4_server_notification_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_empty_content-subscriptions_r4_server_empty_content_interaction_verification-subscriptions_r4_server_empty_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_id_only_content-subscriptions_r4_server_id_only_content_interaction_verification-subscriptions_r4_server_notification_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_id_only_content-subscriptions_r4_server_id_only_content_interaction_verification-subscriptions_r4_server_id_only_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_full_resource_content-subscriptions_r4_server_full_resource_content_interaction_verification-subscriptions_r4_server_notification_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_full_resource_content-subscriptions_r4_server_full_resource_content_interaction_verification-subscriptions_r4_server_full_resource_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_handshake_heartbeat-subscriptions_r4_server_handshake_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_handshake_heartbeat-subscriptions_r4_server_heartbeat_conformance"
 hl7.fhir.uv.subscriptions_1.1.0,15,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#subscription-notifications,"Note that since notifications use history type Bundles, all notifications need to comply with the requirements for that bundle type. Specifically, there are two invariants on Bundle (bdl-3 and bdl-4) that require a Bundle.entry.request element for every Bundle.entry. 
 - For the status resource (entry[0]) the request SHALL be filled out to match a request to the $status operation. 
@@ -68,7 +68,7 @@ hl7.fhir.uv.subscriptions_1.1.0,69,https://hl7.org/fhir/uv/subscriptions-backpor
 hl7.fhir.uv.subscriptions_1.1.0,70,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/conformance.html#notification-entry-subscriptionstatus-1,The status entry SHALL be the first entry of each notification bundle.,SHALL,Server,,,NA,NA,"1.2.01, 3.1.2.01, 3.1.2.02, 3.2.2.01, 3.2.2.02, 3.3.2.01, 3.3.2.02, 4.01, 4.02","subscriptions_r5_backport_r4_server-subscriptions_r4_server_workflow-subscriptions_r4_server_interaction_verification-subscriptions_r4_server_notification_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_empty_content-subscriptions_r4_server_empty_content_interaction_verification-subscriptions_r4_server_notification_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_empty_content-subscriptions_r4_server_empty_content_interaction_verification-subscriptions_r4_server_empty_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_id_only_content-subscriptions_r4_server_id_only_content_interaction_verification-subscriptions_r4_server_notification_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_id_only_content-subscriptions_r4_server_id_only_content_interaction_verification-subscriptions_r4_server_id_only_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_full_resource_content-subscriptions_r4_server_full_resource_content_interaction_verification-subscriptions_r4_server_notification_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_full_resource_content-subscriptions_r4_server_full_resource_content_interaction_verification-subscriptions_r4_server_full_resource_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_handshake_heartbeat-subscriptions_r4_server_handshake_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_handshake_heartbeat-subscriptions_r4_server_heartbeat_conformance"
 hl7.fhir.uv.subscriptions_1.1.0,71,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/conformance.html#notification-entry-subscriptionstatus-1,Clients supporting this guide SHALL be able to process a valid R4 Backported R5 SubscriptionStatus resource without errors.,SHALL,Client,,,"1.2.01, 1.2.02","subscriptions_r5_backport_r4_client-subscriptions_r4_client_workflow-subscriptions_r4_client_interaction_verification-subscriptions_r4_client_handshake_notification_verification, subscriptions_r5_backport_r4_client-subscriptions_r4_client_workflow-subscriptions_r4_client_interaction_verification-subscriptions_r4_client_event_notification_verification",NA,NA
 hl7.fhir.uv.subscriptions_1.1.0,72,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/conformance.html#subscriptioncriteria-1,"The Subscription.criteria element is required (cardinality of 1..1), so any compatible implementation SHALL be able to read and/or write as necessary.",SHALL,Server,,,NA,NA,"1.1.01, 3.1.1.01, 3.2.1.01, 3.3.1.01","subscriptions_r5_backport_r4_server-subscriptions_r4_server_workflow-subscriptions_r4_server_interaction-subscriptions_r4_server_subscription_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_empty_content-subscriptions_r4_server_empty_content_interaction-subscriptions_r4_server_subscription_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_id_only_content-subscriptions_r4_server_id_only_content_interaction-subscriptions_r4_server_subscription_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_full_resource_content-subscriptions_r4_server_full_resource_content_interaction-subscriptions_r4_server_subscription_conformance"
-hl7.fhir.uv.subscriptions_1.1.0,73,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/conformance.html#subscriptioncriteria-1,"Compared with the core specification, this guide specifies that the [Subscription.criteria] element SHALL contain the canonical URL for the Subscription Topic.",SHALL,Server,,,NA,NA,,
+hl7.fhir.uv.subscriptions_1.1.0,73,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/conformance.html#subscriptioncriteria-1,"Compared with the core specification, this guide specifies that the [Subscription.criteria] element SHALL contain the canonical URL for the Subscription Topic.",SHALL,Server,,,NA,NA,"1.1.01, 3.1.1.01, 3.2.1.01, 3.3.1.01","subscriptions_r5_backport_r4_server-subscriptions_r4_server_workflow-subscriptions_r4_server_interaction-subscriptions_r4_server_subscription_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_empty_content-subscriptions_r4_server_empty_content_interaction-subscriptions_r4_server_subscription_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_id_only_content-subscriptions_r4_server_id_only_content_interaction-subscriptions_r4_server_subscription_conformance, subscriptions_r5_backport_r4_server-subscriptions_r4_server_event_notification-subscriptions_r4_server_full_resource_content-subscriptions_r4_server_full_resource_content_interaction-subscriptions_r4_server_subscription_conformance"
 hl7.fhir.uv.subscriptions_1.1.0,74,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/conformance.html#subscriptioncriteria-1,Servers supporting this guide SHALL be able to read values in this [Subscription.criteria] element and process requests for subscription topics referenced by it.,SHALL,Server,,,NA,NA,,
 hl7.fhir.uv.subscriptions_1.1.0,75,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/conformance.html#subscriptioncriteria-1,"If a server does not support a requested topic [in the Subscription.criteria element] or will not honor the subscription otherwise, a server SHALL reject the subscription request.",SHALL,Server,,,NA,NA,,
 hl7.fhir.uv.subscriptions_1.1.0,76,https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/conformance.html#subscriptioncriteria-1,Clients supporting this guide SHALL be able to write subscription topic URLs into this [Subscription.criteria] element.,SHALL,Client,,,1.3.01,subscriptions_r5_backport_r4_client-subscriptions_r4_client_workflow-subscriptions_r4_client_conformance_verification-subscriptions_r4_client_subscription_verification,NA,NA

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/common/subscription_simulation_utils.rb

@@ -16,25 +16,32 @@ module SubscriptionsTestKit
         JSON.parse(test_result.input_json).find { |i| i['name'] == 'client_endpoint_access_token' }['value']
       end
 
-      def derive_handshake_notification(notification_json, subscription_url)
+      def derive_handshake_notification(notification_json, subscription_url, subscription_topic)
         notification_bundle = FHIR.from_contents(notification_json)
-        subscription_status = update_subscription_status(notification_bundle, subscription_url, 'requested', 0,
-                                                         'handshake')
+        subscription_status = update_subscription_status(notification_bundle, subscription_url, subscription_topic,
+                                                         'requested', 0, 'handshake')
         subscription_status.parameter.delete(find_parameter(subscription_status, 'notification-event'))
         subscription_status.parameter.delete(find_parameter(subscription_status, 'error'))
+        notification_bundle.entry = [find_subscription_status_entry(notification_bundle)]
+        notification_bundle.timestamp = Time.now.utc.iso8601
         notification_bundle
       end
 
-      def derive_event_notification(notification_json, subscription_url, event_count)
+      def derive_event_notification(notification_json, subscription_url, subscription_topic, event_count)
+        notification_timestamp = Time.now.utc.iso8601
         notification_bundle = FHIR.from_contents(notification_json)
-        update_subscription_status(notification_bundle, subscription_url, 'active', event_count, 'event-notification')
+        subscription_status = update_subscription_status(notification_bundle, subscription_url, subscription_topic,
+                                                         'active', event_count, 'event-notification')
+        update_event_timestamps(subscription_status, notification_timestamp)
+        notification_bundle.timestamp = notification_timestamp
         notification_bundle
       end
 
-      def derive_status_bundle(notification_json, subscription_url, status_code, event_count, request_url)
+      def derive_status_bundle(notification_json, subscription_url, subscription_topic,
+                               status_code, event_count, request_url)
         notification_bundle = FHIR.from_contents(notification_json)
-        subscription_status = update_subscription_status(notification_bundle, subscription_url, status_code,
-                                                         event_count, 'query-status')
+        subscription_status = update_subscription_status(notification_bundle, subscription_url, subscription_topic,
+                                                         status_code, event_count, 'query-status')
         subscription_status.parameter.delete(find_parameter(subscription_status, 'notification-event'))
         subscription_status_entry = find_subscription_status_entry(notification_bundle)
         FHIR::Bundle.new(
@@ -45,7 +52,8 @@ module SubscriptionsTestKit
           ),
           link: FHIR::Bundle::Link.new(relation: 'self', url: request_url),
           total: 1,
-          type: 'searchset'
+          type: 'searchset',
+          timestamp: Time.now.utc.iso8601
         )
       end
 
@@ -55,14 +63,19 @@ module SubscriptionsTestKit
         oo
       end
 
-      def find_subscription(test_session_id)
+      def find_subscription(test_session_id, as_json: false)
         request = requests_repo.tagged_requests(test_session_id, [SUBSCRIPTION_CREATE_TAG])&.find do |r|
           r.status == 201
         end
         return unless request
 
         begin
-          FHIR.from_contents(request.response_body)
+          if as_json
+            # needed to access primitive extensions
+            JSON.parse(request.response_body)
+          else
+            FHIR.from_contents(request.response_body)
+          end
         rescue StandardError
           nil
         end
@@ -106,18 +119,29 @@ module SubscriptionsTestKit
         subscription_url&.reference&.chomp('/')&.split('/')&.last
       end
 
-      def update_subscription_status(notification_bundle, subscription_url, status_code, event_count, type)
+      def update_subscription_status(notification_bundle, subscription_url, subscription_topic, status_code,
+                                     event_count, type)
         subscription_status_entry = find_subscription_status_entry(notification_bundle)
-        subscription_status_entry.request = FHIR::Bundle::Entry::Request.new(method: 'POST',
+        subscription_status_entry.request = FHIR::Bundle::Entry::Request.new(method: 'GET',
                                                                              url: "#{subscription_url}/$status")
+        subscription_status_entry.response = FHIR::Bundle::Entry::Response.new(status: '200')
         subscription_status = subscription_status_entry&.resource
         set_subscription_reference(subscription_status, subscription_url)
+        find_parameter(subscription_status, 'topic')&.valueCanonical = subscription_topic
         find_parameter(subscription_status, 'status')&.valueCode = status_code
         find_parameter(subscription_status, 'type')&.valueCode = type
         find_parameter(subscription_status, 'events-since-subscription-start')&.valueString = event_count.to_s
         subscription_status
       end
 
+      def update_event_timestamps(subscription_status, timestamp = nil)
+        timestamp = Time.now.utc.iso8601 unless timestamp.present?
+        event_list = find_all_parameters(subscription_status, 'notification-event')
+        event_list.each do |event|
+          event.part.find { |part| part.name == 'timestamp' }&.valueInstant = timestamp
+        end
+      end
+
       def find_subscription_status_entry(notification_bundle)
         notification_bundle.entry.find do |e|
           e.resource&.resourceType == 'Parameters' && e.resource.parameter&.any? { |p| p.name == 'subscription' }
@@ -138,6 +162,10 @@ module SubscriptionsTestKit
       def find_parameter(subscription_status, parameter_name)
         subscription_status.parameter&.find { |p| p.name == parameter_name }
       end
+
+      def find_all_parameters(subscription_status, parameter_name)
+        subscription_status.parameter&.select { |p| p.name == parameter_name }
+      end
     end
   end
 end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/conformance_verification/notification_input_payload_verification_test.rb

@@ -13,8 +13,11 @@ module SubscriptionsTestKit
 
       id :subscriptions_r4_client_notification_input_payload_verification
       title '[USER INPUT VERIFICATION] Notification Bundle Input Conformance Verification for Payload Content'
-      description 'This test verifies that the notification bundle from the test input meets the requirements ' \
-                  'of the payload indicated in the subscription created by the client under test.'
+      description %(
+        This test verifies that the notification bundle sent by Inferno meets the requirements
+        of the payload indicated in the subscription created by the client under test.
+        The content of the notification will be based on the Bundle provided by the tester.
+      )
       input :notification_bundle
 
       run do
@@ -30,20 +33,24 @@ module SubscriptionsTestKit
         payload_content_code = payload_ext['valueCode'] if payload_ext
         skip_if(payload_content_code.nil?, 'Subscription does not have a payload content code')
 
-        criteria_resource_type = subscription_criteria(subscription.source_hash)
+        load_tagged_requests(REST_HOOK_EVENT_NOTIFICATION_TAG)
+        skip_if(requests.none?, 'Inferno did not send an event notification')
 
         case payload_content_code
         when 'empty'
-          empty_event_notification_verification(notification_bundle)
+          empty_event_notification_verification(request.request_body)
         when 'id-only'
-          id_only_event_notification_verification(notification_bundle, criteria_resource_type)
+          id_only_event_notification_verification(request.request_body, nil)
         when 'full-resource'
-          full_resource_event_notification_verification(notification_bundle, criteria_resource_type)
+          full_resource_event_notification_verification(request.request_body, nil)
         else
           skip "Unrecognized payload content code: #{payload_content_code}"
         end
 
-        no_error_verification('Notification bundle input payload content was not conformant, see error messages')
+        no_error_verification(%(
+          Notification bundle payload content was not conformant to requirements of the #{payload_content_code}
+          content type. See error messages for details.
+        ))
       end
     end
   end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/conformance_verification/notification_input_verification_test.rb

@@ -10,15 +10,18 @@ module SubscriptionsTestKit
       id :subscriptions_r4_client_notification_input_verification
       title '[USER INPUT VERIFICATION] Notification Bundle Input Conformance Verification'
       description %(
-        This test verifies that the notification bundle provided by the tester is conformant
+        This test verifies that the notification bundle sent is conformant
         to the [R4 Topic-Based Subscription Notification Bundle
         profile](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription-notification-r4.html).
-      )
+        The content of the notification will be based on the Bundle provided by the tester.
+        )
       input :notification_bundle
 
       run do
-        notification_verification(notification_bundle, 'event-notification')
-        no_error_verification('Notification bundle input was not conformant, see error messages')
+        load_tagged_requests(REST_HOOK_EVENT_NOTIFICATION_TAG)
+        skip_if(requests.none?, 'Inferno did not send an event notification')
+        notification_verification(request.request_body, 'event-notification')
+        no_error_verification('Notification bundle was not conformant, see error messages')
       end
     end
   end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/conformance_verification/subscription_verification_test.rb

@@ -22,6 +22,7 @@ module SubscriptionsTestKit
         load_tagged_requests(SUBSCRIPTION_CREATE_TAG)
         skip_if(requests.none?, 'Inferno did not receive a Subscription creation request')
         subscription_verification(request.request_body)
+        no_error_verification('Subscription resource is not conformant.')
       end
     end
   end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/interaction_test.rb

@@ -3,6 +3,7 @@
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Client
     class InteractionTest < Inferno::Test
+      include URLs
       id :subscriptions_r4_client_interaction
       description %(
         During this test, the client under test will interact with Inferno following the Subscription

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/common/interaction/subscription_conformance_test.rb

@@ -32,6 +32,7 @@ module SubscriptionsTestKit
       )
 
       verifies_requirements 'hl7.fhir.uv.subscriptions_1.1.0@72',
+                            'hl7.fhir.uv.subscriptions_1.1.0@73',
                             'hl7.fhir.uv.subscriptions_1.1.0@86'
 
       input :subscription_resource,
@@ -54,17 +55,12 @@ module SubscriptionsTestKit
               sent to Inferno.
             )
 
-      output :updated_subscription, :subscription_topic
+      output :updated_subscription
 
       run do
         omit_if subscription_resource.blank?, 'Did not input a Subscription resource of this type.'
         subscription = subscription_verification(subscription_resource)
         no_error_verification('Subscription resource is not conformant.')
-
-        assert(subscription['criteria'].present?,
-               'The `criteria` field SHALL be populated and contain the canonical URL for the Subscription Topic.')
-        output subscription_topic: subscription['criteria']
-
         subscription = server_check_channel(subscription, access_token)
         output updated_subscription: subscription.to_json
       end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/common/subscription_creation.rb

@@ -16,6 +16,12 @@ module SubscriptionsTestKit
         field_path.reduce(subscription) { |obj, path| obj[path] }
       end
 
+      def normalize_value(value)
+        return value.deep_transform_keys(&:to_sym) if value.is_a?(Hash)
+
+        value
+      end
+
       def send_unsupported_subscription(subscription, unsupported_type, field_paths, subscription_field_old_values)
         fhir_operation('/Subscription', body: subscription)
 
@@ -27,7 +33,10 @@ module SubscriptionsTestKit
         altered_field = false
         field_paths.each_with_index do |field_path, index|
           subscription_field_new_value = get_new_subscription_value(new_subscription, field_path)
-          if subscription_field_new_value != subscription_field_old_values[index]
+          new_value = normalize_value(subscription_field_new_value)
+          old_value = normalize_value(subscription_field_old_values[index])
+
+          if new_value != old_value
             altered_field = true
             break
           end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/event_notification/full_resource_content/full_resource_conformance_test.rb

@@ -54,11 +54,10 @@ module SubscriptionsTestKit
           requests = load_tagged_requests('event-notification', subscription['id'])
           skip_if requests.empty?, 'No event-notification requests were made in a previous test as expected.'
 
-          criteria_resource_type = subscription_criteria(subscription)
           requests = requests.uniq(&:request_body)
 
           requests.each do |request|
-            full_resource_event_notification_verification(request.request_body, criteria_resource_type)
+            full_resource_event_notification_verification(request.request_body, nil)
           end
         end
         no_error_verification('Received notification-events are not conformant.')

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/event_notification/id_only_content/id_only_conformance_test.rb

@@ -52,11 +52,10 @@ module SubscriptionsTestKit
           requests = load_tagged_requests('event-notification', subscription['id'])
           skip_if requests.empty?, 'No event-notification requests were made in a previous test as expected.'
 
-          criteria_resource_type = subscription_criteria(subscription)
           requests = requests.uniq(&:request_body)
 
           requests.each do |request|
-            id_only_event_notification_verification(request.request_body, criteria_resource_type)
+            id_only_event_notification_verification(request.request_body, nil)
           end
         end
         no_error_verification('Received notification-events are not conformant.')

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/subscription_rejection/reject_subscription_channel_endpoint_test.rb

@@ -0,0 +1,65 @@
+require_relative '../common/subscription_creation'
+
+module SubscriptionsTestKit
+  module SubscriptionsR5BackportR4Server
+    class RejectSubscriptionChannelEndpointTest < Inferno::Test
+      include SubscriptionCreation
+
+      id :subscriptions_r4_server_reject_subscription_channel_endpoint
+      title 'Server Handles Unsupported Subscription Channel Endpoints'
+      description %(
+        When processing a request for a Subscription a server SHOULD verify that the Subscription is supported and does
+        not contain any information not implemented by the server. If the Subscription is not supported, the server
+        should reject the Subscription create request, or it should attempt to adjust the Subscription. When
+        processing a request for a Subscription, a server SHOULD validate that the channel endpoint is valid
+        for the channel provided (e.g., is it a valid URL of the expected type).
+
+        The test will pass if the server either
+        1. rejects the Subscription by responding with a non-201 response, or
+        2. updates the Subscription resource to remove or replace the unsupported value.
+      )
+
+      verifies_requirements 'hl7.fhir.uv.subscriptions_1.1.0@11'
+
+      input :subscription_resource,
+            title: 'Workflow Subscription Resource',
+            type: 'textarea',
+            description: %(
+              A Subscription resource in JSON format that Inferno will send to the server under test
+              so that it can demonstrate its ability to perform the Subscription creation and Notification
+              response workflow. The instance must be conformant to the R4/B Topic-Based Subscription profile.
+              Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification endpoint.
+              This input is also used by the unsupported Subscription test as the base on which to add unsupported
+              element values to test for server rejection.
+            )
+      input :unsupported_subscription_channel_endpoint,
+            title: 'Unsupported Subscription Channel Endpoint',
+            description: 'An unsupported value for the `channel.endpoint` element to test for Subscription rejection.',
+            optional: true
+
+      run do
+        skip_if(unsupported_subscription_channel_endpoint.blank?, %(
+          Provide a value in the "Unsupported Subscription Channel Endpoint" input to run this test.))
+
+        assert_valid_json(subscription_resource)
+        subscription = JSON.parse(subscription_resource)
+
+        unsupported_info = {
+          'unsupported_title' => 'unsupported channel URL',
+          'field_path' => ['channel', 'endpoint'],
+          'field_value' => unsupported_subscription_channel_endpoint
+        }
+
+        field_name = unsupported_info['field_path'].last
+        outer_field_name = unsupported_info['field_path'].first
+        subscription_field = subscription[outer_field_name]
+        subscription_field[field_name] = unsupported_info['field_value']
+
+        send_unsupported_subscription(subscription, unsupported_info['unsupported_title'],
+                                      [unsupported_info['field_path']], [unsupported_info['field_value']])
+
+        no_error_verification('Unsupported Subscription creation error handling failures.')
+      end
+    end
+  end
+end