subscriptions_test_kit 0.9.1 → 0.9.3

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

@@ -8,13 +8,13 @@ require_relative 'conformance_verification/processing_attestation_test'
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Client
     class ConformanceVerificationGroup < Inferno::TestGroup
-      id :subscriptions_r5_backport_r4_client_conformance_verification
+      id :subscriptions_r4_client_conformance_verification
       title 'Rest-Hook Subscription Conformance Verification'
 
-      test from: :subscriptions_r5_backport_r4_client_subscription_verification
-      test from: :subscriptions_r5_backport_r4_client_notification_input_verification
-      test from: :subscriptions_r5_backport_r4_client_notification_input_payload_verification
-      test from: :subscriptions_r5_backport_r4_client_processing_attestation
+      test from: :subscriptions_r4_client_subscription_verification
+      test from: :subscriptions_r4_client_notification_input_verification
+      test from: :subscriptions_r4_client_notification_input_payload_verification
+      test from: :subscriptions_r4_client_processing_attestation
     end
   end
-end
+end

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

@@ -3,7 +3,7 @@
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Client
     class InteractionTest < Inferno::Test
-      id :subscriptions_r5_backport_r4_client_interaction
+      id :subscriptions_r4_client_interaction
       description %(
         During this test, the client under test will interact with Inferno following the Subscription
         workflow over a `rest-hook` channel. This includes the following steps
@@ -17,19 +17,20 @@ module SubscriptionsTestKit
         Afterwards, Inferno will no longer respond to requests.
 
         To create the handshake and event notifications, Inferno uses the contents of the *Event
-        Notification Bundle* input. The provided notification will be modified as appropriate for 
+        Notification Bundle* input. The provided notification will be modified as appropriate for
         the request Inferno is making:
         - General changes for all notification types
           - update the `subscription` parameter entry reference.
           - update the `status` parameter entry based on the previous interactions.
-          - update the `type` parameter entry based on the notification type (e.g., `event-notification` or `handshake`).
+          - update the `type` parameter entry based on the notification type (e.g., `event-notification` or
+            `handshake`).
           - update the number of notifications sent in the `events-since-subscription-start` parameter entry.
         - `handshake`-specific changes:
           - clear the `events` parameter entry.
           - clear the `errors` parameter entry.
 
-        While the provided Notification must be conformant to the 
-        [R4 Topic-Based Subscription Notification Bundle 
+        While the provided Notification must be 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)
         for the tests to pass, the tests can run as long as the notification meets the
         following minimal requirements:
@@ -49,10 +50,10 @@ module SubscriptionsTestKit
             optional: true,
             title: 'Client Notification Access Token',
             description: %(
-              The bearer token that Inferno will send on requests to the client under test's rest-hook notification endpoint. Not
-              needed if the client under test will create a Subscription with an appropriate header value in the
-              `channel.header` element. If a value for the `authorization` header is provided in `channel.header`, this
-              value will override it.
+              The bearer token that Inferno will send on requests to the client under test's rest-hook notification
+              endpoint. Not needed if the client under test will create a Subscription with an appropriate header value
+              in the `channel.header` element. If a value for the `authorization` header is provided in
+              `channel.header`, this value will override it.
             )
       input :notification_bundle,
             title: 'Event Notification Bundle',
@@ -67,7 +68,9 @@ module SubscriptionsTestKit
 
       run do
         minimally_validate_notification(notification_bundle)
-        assert(messages.none? { |m| m[:type] == 'error' }, 'Notification Bundle input is invalid for use by Inferno, see error message(s)')
+        assert(messages.none? do |m|
+                 m[:type] == 'error'
+               end, 'Notification Bundle input is invalid for use by Inferno, see error message(s)')
 
         wait(
           identifier: access_token,
@@ -118,11 +121,11 @@ module SubscriptionsTestKit
         # Require the subscription param, just because we need something to later identify the subscription status
         # bundle entry. Note we could just as easily use a different required param, like status or type.
         subscription_param = subscription_status.parameter&.find { |p| p.name == 'subscription' }
-        assert(subscription_param.present?, 'Subscription status entry in notification bundle input must contain a'\
+        assert(subscription_param.present?, 'Subscription status entry in notification bundle input must contain a' \
                                             'subscription parameter')
       rescue Inferno::Exceptions::AssertionException => e
         add_message('error', e.message)
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/interaction_verification/event_notification_verification_test.rb

@@ -7,7 +7,7 @@ module SubscriptionsTestKit
     class EventNotificationVerificationTest < Inferno::Test
       include SubscriptionSimulationUtils
 
-      id :subscriptions_r5_backport_r4_client_event_notification_verification
+      id :subscriptions_r4_client_event_notification_verification
       title 'Rest-Hook Event Notification Verification'
       description %(
         This test verifies that the client's response to the event notification
@@ -23,18 +23,19 @@ module SubscriptionsTestKit
         # The SendSubscriptionNotifications job saves a nil status if the request fails entirely
         assert(request.status.present?, "Handshake notification request failed with error: #{request.response_body}")
 
-        assert(request.status.between?(200, 299), "Event notification was not successful, status code #{request.status}")
+        assert(request.status.between?(200, 299),
+               "Event notification was not successful, status code #{request.status}")
 
         subscription = find_subscription(test_session_id)
         if subscription.present?
           mime_type = subscription&.channel&.payload
           unless ALLOWED_MIME_TYPES.include?(mime_type)
-            add_message('warning', %(Subscription specified '#{mime_type}' for `Subscription.channel.payload`, but Inferno
-                                    only supports: #{ALLOWED_MIME_TYPES.map { |type| "'#{type}'" }.join(', ')}.
-                                    Event notification was sent with Content-Type: '#{DEFAULT_MIME_TYPE}'.))
+            add_message('warning', %(Subscription specified '#{mime_type}' for `Subscription.channel.payload`, but
+                                     Inferno only supports: #{ALLOWED_MIME_TYPES.map { |type| "'#{type}'" }.join(', ')}.
+                                     Event notification was sent with Content-Type: '#{DEFAULT_MIME_TYPE}'.))
           end
         end
       end
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow/interaction_verification/handshake_notification_verification_test.rb

@@ -7,7 +7,7 @@ module SubscriptionsTestKit
     class HandshakeNotificationVerificationTest < Inferno::Test
       include SubscriptionSimulationUtils
 
-      id :subscriptions_r5_backport_r4_client_handshake_notification_verification
+      id :subscriptions_r4_client_handshake_notification_verification
       title 'Rest-Hook Handshake Notification Verification'
       description %(
         This test verifies that the client's response to the handshake notification
@@ -23,18 +23,18 @@ module SubscriptionsTestKit
         assert(request.status.present?, "Handshake notification request failed with error: #{request.response_body}")
 
         assert(request.status.between?(200, 299),
-              "Handshake notification was not successful, status code #{request.status}")
+               "Handshake notification was not successful, status code #{request.status}")
 
         subscription = find_subscription(test_session_id)
         if subscription.present?
           mime_type = subscription&.channel&.payload
           unless ALLOWED_MIME_TYPES.include?(mime_type)
-            add_message('warning', %(Subscription specified '#{mime_type}' for `Subscription.channel.payload`, but Inferno
-                                    only supports: #{ALLOWED_MIME_TYPES.map { |type| "'#{type}'" }.join(', ')}.
-                                    Handshake notification was sent with Content-Type: '#{DEFAULT_MIME_TYPE}'.))
+            add_message('warning', %(Subscription specified '#{mime_type}' for `Subscription.channel.payload`, but
+                                     Inferno only supports: #{ALLOWED_MIME_TYPES.map { |type| "'#{type}'" }.join(', ')}.
+                                     Handshake notification was sent with Content-Type: '#{DEFAULT_MIME_TYPE}'.))
           end
         end
       end
     end
   end
-end
+end

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

@@ -6,11 +6,11 @@ require_relative 'interaction_verification/event_notification_verification_test'
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Client
     class InteractionVerificationGroup < Inferno::TestGroup
-      id :subscriptions_r5_backport_r4_client_interaction_verification
+      id :subscriptions_r4_client_interaction_verification
       title 'Rest-Hook Subscription Interaction Verification'
 
-      test from: :subscriptions_r5_backport_r4_client_handshake_notification_verification
-      test from: :subscriptions_r5_backport_r4_client_event_notification_verification
+      test from: :subscriptions_r4_client_handshake_notification_verification
+      test from: :subscriptions_r4_client_event_notification_verification
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client/workflow_group.rb

@@ -9,7 +9,7 @@ module SubscriptionsTestKit
     class WorkflowGroup < Inferno::TestGroup
       include URLs
 
-      id :subscriptions_r5_backport_r4_client_workflow
+      id :subscriptions_r4_client_workflow
       title 'Demonstrate the Rest-Hook Subscription Workflow'
       description %(
           Demonstrate the ability of the client to request the
@@ -23,11 +23,11 @@ module SubscriptionsTestKit
       run_as_group
 
       group 'Rest-Hook Subscription Interaction' do
-        test from: :subscriptions_r5_backport_r4_client_interaction
+        test from: :subscriptions_r4_client_interaction
       end
 
-      group from: :subscriptions_r5_backport_r4_client_interaction_verification
-      group from: :subscriptions_r5_backport_r4_client_conformance_verification
+      group from: :subscriptions_r4_client_interaction_verification
+      group from: :subscriptions_r4_client_conformance_verification
     end
   end
 end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_client_suite.rb

@@ -13,7 +13,8 @@ module SubscriptionsTestKit
       title 'Subscriptions R5 Backport IG v1.1.0 FHIR R4 Client Test Suite'
       short_title 'Subscriptions R4 Client'
       version VERSION
-      description File.read(File.join(__dir__, '..', 'docs', 'subscriptions_r5_backport_r4_client_suite_description.md'))
+      description File.read(File.join(__dir__, '..', 'docs',
+                                      'subscriptions_r5_backport_r4_client_suite_description.md'))
 
       links [
         {
@@ -43,7 +44,8 @@ module SubscriptionsTestKit
         end
       end
 
-      capability_statement = File.read(File.join(__dir__, 'subscriptions_r5_backport_r4_client', 'fixtures', 'capability_statement.json'))
+      capability_statement = File.read(File.join(__dir__, 'subscriptions_r5_backport_r4_client', 'fixtures',
+                                                 'capability_statement.json'))
       route(:get, '/fhir/metadata', proc { [200, { 'Content-Type' => 'application/json' }, [capability_statement]] })
 
       suite_endpoint :post, FHIR_SUBSCRIPTION_PATH, SubscriptionCreateEndpoint
@@ -60,7 +62,7 @@ module SubscriptionsTestKit
         request.query_parameters['test_run_identifier']
       end
 
-      group from: :subscriptions_r5_backport_r4_client_workflow
+      group from: :subscriptions_r4_client_workflow
     end
   end
-end
+end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/{coverage/capability_statement → capability_statement}/cs_conformance_test.rb

@@ -1,7 +1,7 @@
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class CSConformanceTest < Inferno::Test
-      id :subscriptions_r5_backport_r4_server_cs_conformance
+      id :subscriptions_r4_server_cs_conformance
       title 'Capability Statement Conformance Verification'
       description %(
         This test attempts to retreive the server's Capability Statement in order to verify that it
@@ -33,7 +33,7 @@ module SubscriptionsTestKit
         assert(rest_subscription.present?, 'Capability Statement missing `Subscription` resource in `rest` field')
 
         assert(rest_subscription.supportedProfile.present?,
-              'Capability Statement missing the `supportedProfile` field in `Subscription` resource')
+               'Capability Statement missing the `supportedProfile` field in `Subscription` resource')
 
         subscription_profile_present = rest_subscription.supportedProfile.any? do |profile|
           profile == subscription_profile_url

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/{coverage/capability_statement → capability_statement}/topic_discovery_test.rb

@@ -1,11 +1,11 @@
-require_relative '../../../../common/subscription_conformance_verification'
+require_relative '../../../common/subscription_conformance_verification'
 
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class TopicDiscoveryTest < Inferno::Test
       include SubscriptionConformanceVerification
 
-      id :subscriptions_r5_backport_r4_server_topic_discovery
+      id :subscriptions_r4_server_topic_discovery
       title 'Attempt topic discovery'
       description %(
         This test attempts to perform topic discovery with the server. In order to allow for [discovery of supported
@@ -59,7 +59,7 @@ module SubscriptionsTestKit
         assert(rest_subscription.present?, 'Capability Statement missing `Subscription` resource in `rest` field')
 
         assert(rest_subscription.extension.present?,
-              'Capability Statement missing the `extension` field on the Subscription resource')
+               'Capability Statement missing the `extension` field on the Subscription resource')
         subscription_topic_extension = rest_subscription.extension.select do |elem|
           elem.url == capability_statement_subscriptiontopic_extension
         end
@@ -97,8 +97,8 @@ module SubscriptionsTestKit
           )
         else
           add_message('warning', %(
-            No Subscription requests have been made in previous tests. Run the Subscription workflow tests first in order
-            to verify topics found in the SubscriptionTopic Canonical extension))
+            No Subscription requests have been made in previous tests. Run the Subscription workflow tests first in
+            order to verify topics found in the SubscriptionTopic Canonical extension))
         end
       end
     end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/capability_statement_group.rb

@@ -0,0 +1,21 @@
+require_relative 'capability_statement/cs_conformance_test'
+require_relative 'capability_statement/topic_discovery_test'
+
+module SubscriptionsTestKit
+  module SubscriptionsR5BackportR4Server
+    class CapabilityStatementGroup < Inferno::TestGroup
+      id :subscriptions_r4_server_capability_statement
+      title 'Capability Statement Verification'
+      description %(
+        Verify the Backport Subscriptions Server has a conformant Capability Statement and that it declares support for
+        the Backport Subscription Profile on the Subscription resource in the rest field. Then the group will verify if
+        the server supports topic discovert via the Capability Statement, which is an optional requirement.
+      )
+
+      run_as_group
+
+      test from: :subscriptions_r4_server_cs_conformance
+      test from: :subscriptions_r4_server_topic_discovery
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class CreationResponseConformanceTest < Inferno::Test
-      id :subscriptions_r5_backport_r4_server_creation_response_conformance
+      id :subscriptions_r4_server_creation_response_conformance
       title 'Verify Subscription Creation Response'
       description %(
         This test ensures that the server responded to the Subscription creation test with the new created Subscription
@@ -43,7 +43,7 @@ module SubscriptionsTestKit
           assert_resource_type('Subscription', resource: subscription)
 
           assert(subscription.channel.type == 'rest-hook' && subscription.status == 'requested',
-                "The Subscription resource should have it's status set to 'requested', was '#{subscription.status}'")
+                 "The Subscription resource should have it's status set to 'requested', was '#{subscription.status}'")
         end
       end
     end

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

@@ -7,7 +7,7 @@ module SubscriptionsTestKit
       include SubscriptionCreation
       include URLs
 
-      id :subscriptions_r5_backport_r4_server_notification_delivery
+      id :subscriptions_r4_server_notification_delivery
       title 'Send Subscription and Receive Notification Requests from Server'
       description %(
         This test sends a request to create the Subscription resource to the Subscriptions Backport FHIR Server.

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

@@ -5,27 +5,28 @@ module SubscriptionsTestKit
     class SubscriptionConformanceTest < Inferno::Test
       include SubscriptionConformanceVerification
 
-      id :subscriptions_r5_backport_r4_server_subscription_conformance
+      id :subscriptions_r4_server_subscription_conformance
       title '[USER INPUT VERIFICATION] Verify Subscription to Send to Server'
       description %(
         The Subscription resource is used to request notifications for a specific client about a specific topic
         Conceptually, a subscription is a concrete request for a single client to receive notifications per a single
         topic. In order to support topic-based subscriptions in R4, this guide defines several extensions for use on the
-        [R4 Subscription resource](http://hl7.org/fhir/R4/subscription.html). A list of extensions defined by this guide can
-        be found on the [Subscriptions R5 Backport IG's Artifacts page](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/artifacts.html#5).
+        [R4 Subscription resource](http://hl7.org/fhir/R4/subscription.html). A list of extensions defined by this guide
+        can be found on the
+        [Subscriptions R5 Backport IG's Artifacts page](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/artifacts.html#5).
 
-        This test accepts a Subscription resource as an input and verifies that it is conformant to the 
+        This test accepts a Subscription resource as an input and verifies that it is conformant to the
         [R4/B Topic-Based Subscription profile](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription.html).
 
         The Subscription channel should have it's fields populated with the following information:
           - The `endpoint` field must be set to
-          `#{Inferno::Application['base_url']}/custom/subscriptions_r5_backport_r4_server/subscription/channel/notification_listener`.
+          `#{Inferno::Application['base_url']}/custom/subscriptions_r5_backport_r4_server#{SUBSCRIPTION_CHANNEL_PATH}`.
           The test will add the correct url to this field if it is not properly set.
           - The `type` field must be set to `rest-hook`, as the Inferno subscription workflow tests use a `rest-hook`
           subscription channel to receive incoming notifications. The test will add the correct type to this field if it
           is not properly set.
-          - The `payload` field must be set to `application/json`, as Inferno will only accept resources in requests with
-          this content type.
+          - The `payload` field must be set to `application/json`, as Inferno will only accept resources in requests
+          with this content type.
           - The `header` field must include the `Authorization` header with a Bearer token set to the inputted Inferno
           access token.
       )
@@ -41,8 +42,8 @@ module SubscriptionsTestKit
               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.
+              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 :access_token,
             title: 'Notification Access Token',
@@ -61,7 +62,7 @@ module SubscriptionsTestKit
         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.')
+               '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)

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

@@ -5,20 +5,20 @@ require_relative 'interaction/creation_response_conformance_test'
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class InteractionGroup < Inferno::TestGroup
-      id :subscriptions_r5_backport_r4_server_interaction
+      id :subscriptions_r4_server_interaction
       title 'Subscription Workflow Interaction'
       description %(
         Verify that the Subscription instance the tester provided is conformant, and then demonstrate the ability of the
-        server under test to accept a request for the creation of a FHIR Subscription instance and deliver a notification
-        for that Subscription. Inferno will act as a client, creating the Subscription and waiting for a notification
-        based on it.
+        server under test to accept a request for the creation of a FHIR Subscription instance and deliver a
+        notification for that Subscription. Inferno will act as a client, creating the Subscription and waiting for a
+        notification based on it.
       )
 
       run_as_group
 
-      test from: :subscriptions_r5_backport_r4_server_subscription_conformance
-      test from: :subscriptions_r5_backport_r4_server_notification_delivery
-      test from: :subscriptions_r5_backport_r4_server_creation_response_conformance
+      test from: :subscriptions_r4_server_subscription_conformance
+      test from: :subscriptions_r4_server_notification_delivery
+      test from: :subscriptions_r4_server_creation_response_conformance
     end
   end
 end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/common/interaction_verification/notification_conformance_test.rb

@@ -5,7 +5,7 @@ module SubscriptionsTestKit
     class NotificationConformanceTest < Inferno::Test
       include NotificationConformanceVerification
 
-      id :subscriptions_r5_backport_r4_server_notification_conformance
+      id :subscriptions_r4_server_notification_conformance
       title 'Subscription Notification Verification'
       description %(
         As described in [Topic-Based Subscription Components](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/components.html#subscription-notifications),

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

@@ -3,7 +3,7 @@ require_relative 'interaction_verification/notification_conformance_test'
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class InteractionVerificationGroup < Inferno::TestGroup
-      id :subscriptions_r5_backport_r4_server_interaction_verification
+      id :subscriptions_r4_server_interaction_verification
       title 'Subscription Workflow Interaction Verification'
       description %(
         Inferno takes the received event-notification Bundle and verifies that it is conformant to the
@@ -13,7 +13,7 @@ module SubscriptionsTestKit
 
       run_as_group
 
-      test from: :subscriptions_r5_backport_r4_server_notification_conformance
+      test from: :subscriptions_r4_server_notification_conformance
     end
   end
 end

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

@@ -17,7 +17,8 @@ module SubscriptionsTestKit
         assert_resource_type('Bundle')
 
         unless resource.type == 'searchset'
-          add_message('error', "Bundle returned from $status operation should be type 'searchset', was #{resource.type}")
+          add_message('error',
+                      "Bundle returned from $status operation should be type 'searchset', was #{resource.type}")
         end
 
         assert_valid_resource
@@ -39,7 +40,7 @@ module SubscriptionsTestKit
           entry.resource.resourceType == 'Parameters' && subscription_ref_found?(entry, subscription_id)
         end
         assert(subscription_status_entry,
-              "No Subscription status with id #{subscription_id} returned from $status operation")
+               "No Subscription status with id #{subscription_id} returned from $status operation")
 
         subscription_status_resource = subscription_status_entry.resource
         assert_valid_resource(resource: subscription_status_resource,

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/{coverage/event_notification → event_notification}/empty_content/empty_conformance_test.rb

@@ -1,11 +1,11 @@
-require_relative '../../../../../common/notification_conformance_verification'
+require_relative '../../../../common/notification_conformance_verification'
 
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class EmptyConformanceTest < Inferno::Test
       include NotificationConformanceVerification
 
-      id :subscriptions_r5_backport_r4_server_empty_conformance
+      id :subscriptions_r4_server_empty_conformance
       title 'Subscription Empty Notification Verification'
       description %(
         This test takes the received empty notification bundle and ensures it is conformant to the

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/{coverage/event_notification → event_notification}/empty_content_group.rb

@@ -1,11 +1,11 @@
-require_relative '../../common/interaction_group'
-require_relative '../../common/interaction_verification_group'
+require_relative '../common/interaction_group'
+require_relative '../common/interaction_verification_group'
 require_relative 'empty_content/empty_conformance_test'
 
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class EmptyContentGroup < Inferno::TestGroup
-      id :subscriptions_r5_backport_r4_server_empty_content
+      id :subscriptions_r4_server_empty_content
       title 'Empty Notification Verification'
       description %(
         Verify that the received Notifications are conformant to the
@@ -18,8 +18,8 @@ module SubscriptionsTestKit
 
       input_order :url, :credentials, :access_token, :empty_subscription_resource
 
-      group from: :subscriptions_r5_backport_r4_server_interaction do
-        id :subscriptions_r5_backport_r4_server_empty_content_interaction
+      group from: :subscriptions_r4_server_interaction do
+        id :subscriptions_r4_server_empty_content_interaction
         optional
 
         config(
@@ -31,9 +31,10 @@ module SubscriptionsTestKit
               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 send an empty Notification. 
+                so that it can demonstrate its ability to send an empty Notification.
                 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.
+                Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification
+                endpoint.
             ),
               optional: true
             },
@@ -44,14 +45,14 @@ module SubscriptionsTestKit
           }
         )
       end
-      group from: :subscriptions_r5_backport_r4_server_interaction_verification do
-        id :subscriptions_r5_backport_r4_server_empty_content_interaction_verification
+      group from: :subscriptions_r4_server_interaction_verification do
+        id :subscriptions_r4_server_empty_content_interaction_verification
         optional
 
         config(
           options: { subscription_type: 'empty' }
         )
-        test from: :subscriptions_r5_backport_r4_server_empty_conformance
+        test from: :subscriptions_r4_server_empty_conformance
       end
     end
   end

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/{coverage/event_notification → event_notification}/full_resource_content/full_resource_conformance_test.rb

@@ -1,19 +1,19 @@
-require_relative '../../../../../common/notification_conformance_verification'
+require_relative '../../../../common/notification_conformance_verification'
 
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class FullResourceConformanceTest < Inferno::Test
       include NotificationConformanceVerification
 
-      id :subscriptions_r5_backport_r4_server_full_resource_conformance
+      id :subscriptions_r4_server_full_resource_conformance
       title 'Subscription Full-Resource Notification Verification'
       description %(
         This test takes the received notification bundle and ensures it is conformant to the
         [R4 Topic-Based Subscription Notification Bundle](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription-notification-r4.html)
         profle.
 
-        With the content type of full-resource, the resources involved in triggering the notification are included in the
-        notification bundle.
+        With the content type of full-resource, the resources involved in triggering the notification are included in
+        the notification bundle.
 
         When the content type is full-resource, notification bundles SHALL include references to the
         appropriate focus resources in the SubscriptionStatus.notificationEvent.focus element.

data/lib/subscriptions_test_kit/suites/subscriptions_r5_backport_r4_server/{coverage/event_notification → event_notification}/full_resource_content_group.rb

@@ -1,11 +1,11 @@
-require_relative '../../common/interaction_group'
-require_relative '../../common/interaction_verification_group'
+require_relative '../common/interaction_group'
+require_relative '../common/interaction_verification_group'
 require_relative 'full_resource_content/full_resource_conformance_test'
 
 module SubscriptionsTestKit
   module SubscriptionsR5BackportR4Server
     class FullResourceContentGroup < Inferno::TestGroup
-      id :subscriptions_r5_backport_r4_server_full_resource_content
+      id :subscriptions_r4_server_full_resource_content
       title 'Full Resource Notification Verification'
       description %(
         Verify that the received Notifications are conformant to the
@@ -18,8 +18,8 @@ module SubscriptionsTestKit
 
       input_order :url, :credentials, :access_token, :full_resource_subscription_resource
 
-      group from: :subscriptions_r5_backport_r4_server_interaction do
-        id :subscriptions_r5_backport_r4_server_full_resource_content_interaction
+      group from: :subscriptions_r4_server_interaction do
+        id :subscriptions_r4_server_full_resource_content_interaction
         optional
 
         config(
@@ -31,9 +31,10 @@ module SubscriptionsTestKit
               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 send a full-resource Notification. 
+                so that it can demonstrate its ability to send a full-resource Notification.
                 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.
+                Inferno may modify the Subscription before submission, e.g., to point to Inferno's notification
+                endpoint.
             ),
               optional: true
             },
@@ -44,14 +45,14 @@ module SubscriptionsTestKit
           }
         )
       end
-      group from: :subscriptions_r5_backport_r4_server_interaction_verification do
-        id :subscriptions_r5_backport_r4_server_full_resource_content_interaction_verification
+      group from: :subscriptions_r4_server_interaction_verification do
+        id :subscriptions_r4_server_full_resource_content_interaction_verification
         optional
 
         config(
           options: { subscription_type: 'full-resource' }
         )
-        test from: :subscriptions_r5_backport_r4_server_full_resource_conformance
+        test from: :subscriptions_r4_server_full_resource_conformance
       end
     end
   end