Changed retry tests to allow multiple behaviours

Author: dylan-asos

src/SendGrid/Helpers/Reliability/ReliabilitySettings.cs

@@ -38,7 +38,7 @@ public int RetryCount
 
                 if (value > 5)
                 {
-                    throw new ArgumentException("Retry count must be less than 5");
+                    throw new ArgumentException("The maximum number of retries is 5");
                 }
 
                 retryCount = value;
@@ -59,7 +59,7 @@ public TimeSpan RetryInterval
             {
                 if (value.TotalSeconds > 30)
                 {
-                    throw new ArgumentException("Maximum retry interval is 30 seconds");
+                    throw new ArgumentException("The maximum retry interval is 30 seconds");
                 }
 
                 retryInterval = value;

src/SendGrid/Helpers/Reliability/RetryDelegatingHandler.cs

@@ -1,12 +1,12 @@
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using Polly;
-using Polly.Retry;
-
-namespace SendGrid.Helpers.Reliability
+namespace SendGrid.Helpers.Reliability
 {
+    using System;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Polly;
+    using Polly.Retry;
+
     public class RetryDelegatingHandler : DelegatingHandler
     {
         private readonly ReliabilitySettings settings;

tests/SendGrid.Tests/Helpers/Reliability/RetryDelegatingHandlerTests.cs

@@ -19,7 +19,7 @@ public RetryDelegatingHandlerTests()
         {
             reliabilitySettings = new ReliabilitySettings
             {
-                RetryCount = 2
+                RetryCount = 1
             };
             innerHandler = new RetryTestBehaviourDelegatingHandler();
             client = new HttpClient(new RetryDelegatingHandler(innerHandler, reliabilitySettings))
@@ -31,7 +31,7 @@ public RetryDelegatingHandlerTests()
         [Fact]
         public async Task Invoke_ShouldReturnHttpResponseAndNotRetryWhenSuccessful()
         {
-            innerHandler.ConfigureBehaviour(innerHandler.OK);
+            innerHandler.AddBehaviour(innerHandler.OK);
 
             var result = await client.SendAsync(new HttpRequestMessage());
 
@@ -42,7 +42,7 @@ public async Task Invoke_ShouldReturnHttpResponseAndNotRetryWhenSuccessful()
         [Fact]
         public async Task Invoke_ShouldReturnHttpResponseAndNotRetryWhenUnauthorised()
         {
-            innerHandler.ConfigureBehaviour(innerHandler.AuthenticationError);
+            innerHandler.AddBehaviour(innerHandler.AuthenticationError);
 
             var result = await client.SendAsync(new HttpRequestMessage());
 
@@ -53,43 +53,45 @@ public async Task Invoke_ShouldReturnHttpResponseAndNotRetryWhenUnauthorised()
         [Fact]
         public async Task Invoke_ShouldReturnErrorWithoutRetryWhenErrorIsNotTransient()
         {
-            innerHandler.ConfigureBehaviour(innerHandler.NonTransientException);
+            innerHandler.AddBehaviour(innerHandler.NonTransientException);
 
-            await Assert.ThrowsAsync<InvalidOperationException>(
-                () =>
-                    {
-                        return client.SendAsync(new HttpRequestMessage());
-                    });
+            await Assert.ThrowsAsync<InvalidOperationException>(() => client.SendAsync(new HttpRequestMessage()));
 
             Assert.Equal(1, innerHandler.InvocationCount);
         }
 
+        [Fact]
+        public async Task Invoke_ShoulddRetryOnceWhenFailedOnFirstAttemptThenSuccessful()
+        {
+            innerHandler.AddBehaviour(innerHandler.TaskCancelled);
+            innerHandler.AddBehaviour(innerHandler.OK);
+
+            var result = await client.SendAsync(new HttpRequestMessage());
+
+            Assert.Equal(result.StatusCode, HttpStatusCode.OK);
+            Assert.Equal(2, innerHandler.InvocationCount);
+        }
+
         [Fact]
         public async Task Invoke_ShouldRetryTheExpectedAmountOfTimesAndReturnTimeoutExceptionWhenTasksCancelled()
         {
-            innerHandler.ConfigureBehaviour(innerHandler.TaskCancelled);
+            innerHandler.AddBehaviour(innerHandler.TaskCancelled);
+            innerHandler.AddBehaviour(innerHandler.TaskCancelled);
 
-            await Assert.ThrowsAsync<TimeoutException>(
-                () =>
-                {
-                    return client.SendAsync(new HttpRequestMessage());
-                });
+            await Assert.ThrowsAsync<TimeoutException>(() => client.SendAsync(new HttpRequestMessage()));
 
-            Assert.Equal(3, innerHandler.InvocationCount);
+            Assert.Equal(2, innerHandler.InvocationCount);
         }
 
         [Fact]
         public async Task Invoke_ShouldRetryTheExpectedAmountOfTimesAndReturnExceptionWhenInternalServerErrorsEncountered()
         {
-            innerHandler.ConfigureBehaviour(innerHandler.InternalServerError);
+            innerHandler.AddBehaviour(innerHandler.InternalServerError);
+            innerHandler.AddBehaviour(innerHandler.InternalServerError);
 
-            await Assert.ThrowsAsync<HttpRequestException>(
-                () =>
-                {
-                    return client.SendAsync(new HttpRequestMessage());
-                });
+            await Assert.ThrowsAsync<HttpRequestException>(() => client.SendAsync(new HttpRequestMessage()));
 
-            Assert.Equal(3, innerHandler.InvocationCount);
+            Assert.Equal(2, innerHandler.InvocationCount);
         }
 
         [Fact]

tests/SendGrid.Tests/Helpers/Reliability/RetryTestBehaviourDelegatingHandler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
@@ -8,22 +9,24 @@ namespace SendGrid.Tests.Helpers.Reliability
 {
     public class RetryTestBehaviourDelegatingHandler : DelegatingHandler
     {
-        private Func<Task<HttpResponseMessage>> behaviour;
+        private readonly List<Func<Task<HttpResponseMessage>>> behaviours;
 
         public RetryTestBehaviourDelegatingHandler()
         {
-            ConfigureBehaviour(OK);
+            behaviours = new List<Func<Task<HttpResponseMessage>>>();
         }
 
         public int InvocationCount { get; private set; }
 
-        public void ConfigureBehaviour(Func<Task<HttpResponseMessage>> configuredBehavior)
+        public void AddBehaviour(Func<Task<HttpResponseMessage>> configuredBehavior)
         {
-            behaviour = () =>
+            Task<HttpResponseMessage> behaviour()
             {
                 InvocationCount++;
                 return configuredBehavior();
-            };
+            }
+
+            behaviours.Add(behaviour);
         }
 
         public Task<HttpResponseMessage> OK()
@@ -57,7 +60,7 @@ public Task<HttpResponseMessage> NonTransientException()
 
         protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            return behaviour();
+            return behaviours[InvocationCount]();
         }
     }
 }