Remove PollyQosSteps as ugly composition pattern, thus, it's not required anymore

Author: raman-m

acceptance/DynamicRoutingTests.cs

@@ -78,7 +78,7 @@ public async Task ShouldApplyGlobalQosOptions_ForAllDynamicRoutes_WithGroupedOpt
         };
         GivenDiscoveryMetadata(route3, ports3);
 
-        var configuration = GivenDynamicRouting(new(), route1, route2, route3);
+        var configuration = GivenDynamicRouting([], route1, route2, route3);
         var globalOptions = configuration.GlobalConfiguration.QoSOptions
             = new(new QoSOptions(GlobalExceptions, GlobalBreakMs))
             {

acceptance/PollyQosTests.cs

@@ -3,7 +3,6 @@
 using Ocelot.Configuration;
 using Ocelot.Configuration.File;
 using Ocelot.DependencyInjection;
-using Ocelot.Testing.Steps;
 using Polly.CircuitBreaker;
 using Polly.Timeout;
 using Shouldly;
@@ -14,8 +13,10 @@ namespace Ocelot.QualityOfService.Polly.Acceptance;
 
 [Trait("Feat", "23")] // https://github.com/ThreeMammals/Ocelot/issues/23
 [Trait("Feat", "39")] // https://github.com/ThreeMammals/Ocelot/pull/39
-public sealed class PollyQosTests : PollyQosSteps
+public sealed class PollyQosTests : QosSteps
 {
+    public PollyQosTests() : base(null!) => self = this;
+
     [Fact]
     [Trait("Feat", "318")] // https://github.com/ThreeMammals/Ocelot/issues/318
     [Trait("PR", "319")] // https://github.com/ThreeMammals/Ocelot/pull/319
@@ -505,32 +506,3 @@ private void GivenThereIsAPossiblyBrokenServiceRunningOn(int port, string respon
     public override void GivenThereIsAServiceRunningOn(int port, HttpStatusCode statusCode, int timeout, [CallerMemberName] string response = nameof(PollyQosTests))
         => base.GivenThereIsAServiceRunningOn(port, statusCode, timeout, response);
 }
-
-public class PollyQosSteps : TimeoutSteps, IQosSteps, IDisposable
-{
-    private readonly QosSteps steps;
-    public PollyQosSteps() => steps = new(this);
-
-    public override void Dispose()
-    {
-        steps.Dispose();
-        base.Dispose();
-        GC.SuppressFinalize(this);
-    }
-
-    public void GivenThereIsABrokenServiceOnline(HttpStatusCode onlineStatusCode, int index = 0, int length = 1, bool isDiscovery = false)
-        => steps.GivenThereIsABrokenServiceOnline(onlineStatusCode, index, length, isDiscovery);
-
-    public void GivenThereIsABrokenServiceRunningOn(int port, HttpStatusCode brokenStatusCode, int index = 0)
-        => steps.GivenThereIsABrokenServiceRunningOn(port, brokenStatusCode, index);
-
-    public void GivenThereIsAServiceRunningOn(int port, HttpStatusCode statusCode,
-        Func<int> timeoutStrategy, Func<bool> failingStrategy, [CallerMemberName] string? response = null)
-        => steps.GivenThereIsAServiceRunningOn(port, statusCode, timeoutStrategy, failingStrategy, response);
-
-    public Task TestRouteCircuitBreaker(int[] ports, string upstreamPath, FileQoSOptions qos, int index = 0, bool isDiscovery = false)
-        => steps.TestRouteCircuitBreaker(ports, upstreamPath, qos, index, isDiscovery);
-
-    public Task TestRouteTimeout(int[] ports, string upstreamPath, FileQoSOptions qos)
-        => steps.TestRouteTimeout(ports, upstreamPath, qos);
-}

acceptance/QosSteps.cs

@@ -1,15 +1,15 @@
 using Microsoft.AspNetCore.Http;
 using Ocelot.Configuration.File;
-using Ocelot.Testing;
+using Ocelot.Testing.Steps;
 using System.Collections.Concurrent;
 using System.Net;
 using System.Runtime.CompilerServices;
 
 namespace Ocelot.QualityOfService.Polly.Acceptance;
 
-public class QosSteps : AcceptanceSteps, IQosSteps
+public class QosSteps : TimeoutSteps
 {
-    private readonly AcceptanceSteps self;
+    protected AcceptanceSteps self;
     public QosSteps(AcceptanceSteps self) => this.self = self;
 
     public async Task TestRouteCircuitBreaker(int[] ports, string upstreamPath, FileQoSOptions qos, int index = 0, bool isDiscovery = false)
@@ -97,7 +97,7 @@ public void GivenThereIsABrokenServiceRunningOn(int port, HttpStatusCode brokenS
             return context.Response.WriteAsync(code.ToString());
         });
     }
-    public void GivenThereIsABrokenServiceOnline(HttpStatusCode onlineStatusCode, int index = 0, int length = 1, bool isDiscovery = false)
+    public void GivenThereIsABrokenServiceOnline(HttpStatusCode onlineStatusCode, int index = 0, bool isDiscovery = false)
     {
         if (!isDiscovery)
         {
@@ -110,13 +110,3 @@ public void GivenThereIsABrokenServiceOnline(HttpStatusCode onlineStatusCode, in
         }
     }
 }
-
-public interface IQosSteps
-{
-    Task TestRouteCircuitBreaker(int[] ports, string upstreamPath, FileQoSOptions qos, int index = 0, bool isDiscovery = false);
-    Task TestRouteTimeout(int[] ports, string upstreamPath, FileQoSOptions qos);
-    void GivenThereIsAServiceRunningOn(int port, HttpStatusCode statusCode,
-        Func<int> timeoutStrategy, Func<bool> failingStrategy, [CallerMemberName] string? response = null);
-    void GivenThereIsABrokenServiceRunningOn(int port, HttpStatusCode brokenStatusCode, int index = 0);
-    void GivenThereIsABrokenServiceOnline(HttpStatusCode onlineStatusCode, int index = 0, int length = 1, bool isDiscovery = false);
-}

unit/PollyResiliencePipelineDelegatingHandlerTests.cs

@@ -90,7 +90,7 @@ public async Task SendAsync_WhenResiliencePipelineProviderIsNull_ShouldNotCallGe
         _contextAccessor.Setup(x => x.HttpContext)
             .Returns(new DefaultHttpContext());
         IServiceProvider requestServices = new ServiceCollection().BuildServiceProvider();
-        _contextAccessor.Setup(x => x.HttpContext.RequestServices)
+        _contextAccessor.Setup(x => x.HttpContext!.RequestServices)
             .Returns(requestServices); // empty service provider → GetService returns null
 
         _sut = new PollyResiliencePipelineDelegatingHandler(DownstreamRouteFactory(), _contextAccessor.Object, _loggerFactory.Object);