More tests

Author: ejsmith

src/Foundatio/Utility/ResiliencePipeline.cs

@@ -102,9 +102,6 @@ public FoundatioResiliencePipeline(TimeProvider timeProvider = null, ILogger log
     {
         _timeProvider = timeProvider ?? TimeProvider.System;
         _logger = logger ?? NullLogger.Instance;
-
-        MaxAttempts = 5;
-        RetryInterval = null;
     }
 
     /// <summary>
@@ -123,7 +120,7 @@ public ILogger Logger {
     /// <summary>
     /// The maximum number of attempts to execute the action.
     /// </summary>
-    public int MaxAttempts { get; set; }
+    public int? MaxAttempts { get; set; }
 
     /// <summary>
     /// A function that determines whether to retry based on the attempt number and exception.
@@ -152,6 +149,7 @@ public async ValueTask ExecuteAsync(Func<CancellationToken, ValueTask> action, C
 
         cancellationToken.ThrowIfCancellationRequested();
 
+        int maxAttempts = MaxAttempts ?? (ShouldRetry != null ? Int32.MaxValue : 5);
         int attempts = 1;
         var startTime = _timeProvider.GetUtcNow();
         var linkedCancellationToken = cancellationToken;
@@ -170,7 +168,7 @@ public async ValueTask ExecuteAsync(Func<CancellationToken, ValueTask> action, C
             }
             catch (Exception ex)
             {
-                if ((ShouldRetry != null && !ShouldRetry(attempts, ex)) || attempts >= MaxAttempts)
+                if ((ShouldRetry != null && !ShouldRetry(attempts, ex)) || attempts >= maxAttempts)
                     throw;
 
                 _logger?.LogError(ex, "Retry error: {Message}", ex.Message);
@@ -181,7 +179,7 @@ public async ValueTask ExecuteAsync(Func<CancellationToken, ValueTask> action, C
             }
 
             attempts++;
-        } while (attempts <= MaxAttempts && !linkedCancellationToken.IsCancellationRequested);
+        } while (attempts <= maxAttempts && !linkedCancellationToken.IsCancellationRequested);
 
         throw new TaskCanceledException("Should not get here");
     }
@@ -193,6 +191,7 @@ public async ValueTask<T> ExecuteAsync<T>(Func<CancellationToken, ValueTask<T>>
 
         cancellationToken.ThrowIfCancellationRequested();
 
+        int maxAttempts = MaxAttempts ?? (ShouldRetry != null ? Int32.MaxValue : 5);
         int attempts = 1;
         var startTime = _timeProvider.GetUtcNow();
         var linkedCancellationToken = cancellationToken;
@@ -210,7 +209,7 @@ public async ValueTask<T> ExecuteAsync<T>(Func<CancellationToken, ValueTask<T>>
             }
             catch (Exception ex)
             {
-                if ((ShouldRetry != null && !ShouldRetry(attempts, ex)) || attempts >= MaxAttempts)
+                if ((ShouldRetry != null && !ShouldRetry(attempts, ex)) || attempts >= maxAttempts)
                     throw;
 
                 _logger?.LogError(ex, "Retry error: {Message}", ex.Message);
@@ -221,7 +220,7 @@ public async ValueTask<T> ExecuteAsync<T>(Func<CancellationToken, ValueTask<T>>
             }
 
             attempts++;
-        } while (attempts <= MaxAttempts && !linkedCancellationToken.IsCancellationRequested);
+        } while (attempts <= maxAttempts && !linkedCancellationToken.IsCancellationRequested);
 
         throw new TaskCanceledException("Should not get here");
     }

tests/Foundatio.Tests/Utility/ResiliencePipelineTests.cs

@@ -129,6 +129,43 @@ public async Task CanBoomWithRetriesAndResult()
         Assert.Equal(1, result);
     }
 
+    [Fact]
+    public async Task CanHandleSpecificExceptions()
+    {
+        var pipeline = new FoundatioResiliencePipeline
+        {
+            Logger = _logger,
+            RetryInterval = TimeSpan.Zero,
+            ShouldRetry = (attempts, ex) => attempts < 3 && ex is ApplicationException,
+        };
+
+        int attempt = 0;
+        var exception = await Assert.ThrowsAsync<ApplicationException>(async () =>
+        {
+            await pipeline.ExecuteAsync(() =>
+            {
+                attempt++;
+                throw new ApplicationException("Simulated failure");
+            }, cancellationToken: CancellationToken.None);
+        });
+
+        Assert.Equal("Simulated failure", exception.Message);
+        Assert.Equal(3, attempt);
+
+        attempt = 0;
+        var argumentException = await Assert.ThrowsAsync<ArgumentException>(async () =>
+        {
+            await pipeline.ExecuteAsync(() =>
+            {
+                attempt++;
+                throw new ArgumentException("Unhandled exception type");
+            }, cancellationToken: CancellationToken.None);
+        });
+
+        Assert.Equal("Unhandled exception type", argumentException.Message);
+        Assert.Equal(1, attempt);
+    }
+
     [Fact]
     public async Task CanRunWithRetriesAndCancellation()
     {