Skip to content
This repository was archived by the owner on Aug 18, 2021. It is now read-only.

feat(Polly): simplify ternary unit tests #223

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions src/Liquid.Runtime/Polly/Polly.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
using Polly;
using Polly.Retry;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;

namespace Liquid.Runtime.Polly
Expand All @@ -16,21 +14,22 @@ public override async Task<HttpResponseMessage> ResilientRequest(string url, Htt
{
PollyConfiguration pollyConfig = (PollyConfiguration)pollyconfiguration;
AsyncRetryPolicy<HttpResponseMessage> retryPolicy = null;

// TODO: Please let's remove this ternary
retryPolicy = pollyConfig.IsBackOff == true ? Policy.HandleResult<HttpResponseMessage>(r => r.StatusCode.Equals(HttpStatusCode.InternalServerError))
.Or<WebException>().Or<HttpRequestException>()
if (pollyConfig.IsBackOff == true)
{
retryPolicy = Policy.HandleResult<HttpResponseMessage>(r => r.StatusCode.Equals(HttpStatusCode.InternalServerError)).Or<WebException>().Or<HttpRequestException>()
.WaitAndRetryAsync(pollyConfig.Retry, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)), (result, timeSpan, retryCount, context) =>
{
CallbackError<HttpResponseMessage>(result, timeSpan, retryCount);
}) :

Policy.HandleResult<HttpResponseMessage>(r => r.StatusCode.Equals(HttpStatusCode.InternalServerError)).Or<WebException>().Or<HttpRequestException>()
});
}
else
{
retryPolicy = Policy.HandleResult<HttpResponseMessage>(r => r.StatusCode.Equals(HttpStatusCode.InternalServerError)).Or<WebException>().Or<HttpRequestException>()
.WaitAndRetryAsync(pollyConfig.Retry, retryAttempt => TimeSpan.FromSeconds(pollyConfig.Wait), (result, timeSpan, retryCount, context) =>
{
CallbackError<HttpResponseMessage>(result, timeSpan, retryCount);
});

}
return await retryPolicy.ExecuteAsync(() =>
{
switch (http)
Expand All @@ -54,4 +53,4 @@ private void CallbackError<T>(DelegateResult<T> result, TimeSpan timeSpan, int r
Debug.WriteLine($"Request failed with {result.Result}. Waiting {timeSpan} before next retry. Retry attempt {retryCount}");
}
}
}
}
62 changes: 62 additions & 0 deletions test/Liquid.Runtime.Tests/PollyTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
using System.Net.Http;
using System.Threading.Tasks;
using Liquid.Runtime.Polly;
using Xunit;

namespace Liquid.Runtime.Tests
{
public class PollyTests
{
private readonly LightPolly _sut;
private HttpClient _httpClient;
private WorkBenchServiceHttp _http;

public PollyTests()
{
_sut = new Polly.Polly();
_httpClient = new HttpClient();
_http = WorkBenchServiceHttp.GET;
}

[Fact]
public async Task ResilientRequestWhenInvalidUrlAfterRetriedConfiguredAttempsThrowHttpRequest()
{
//Arrange
PollyConfiguration pollyConfiguration = new PollyConfiguration { IsBackOff = true, Retry = 3, Wait = 5 };
var url = "https://www.aipdhapsidh.com";
//HttpResponseMessage result;

//Action/Assert
await Assert.ThrowsAnyAsync<HttpRequestException>(async () => await _sut.ResilientRequest(url, _httpClient, _http, pollyConfiguration).ConfigureAwait(true));
}

[Fact]
public async Task ResilientRequestShouldUseMathPowAsRetryAttemptWhenIsBackOffTrue()
{
//Arrange
PollyConfiguration pollyConfiguration = new PollyConfiguration { IsBackOff = true, Retry = 3, Wait = 5 };
var url = "https://www.google.com";

//Action
using (HttpResponseMessage result = await _sut.ResilientRequest(url, _httpClient, _http, pollyConfiguration).ConfigureAwait(true))
{
//Assert
Assert.True(result.IsSuccessStatusCode);
}
}

[Fact]
public async Task ResilientRequestShouldUseDefaultPollyConfigAsRetryAttemptWhenIsBackOffFalse()
{
//Arrange
PollyConfiguration pollyConfiguration = new PollyConfiguration { IsBackOff = false, Retry = 3, Wait = 5 };
var url = "https://www.google.com";
//Action
using (HttpResponseMessage result = await _sut.ResilientRequest(url, _httpClient, _http, pollyConfiguration).ConfigureAwait(false))
{
//Assert
Assert.True(result.IsSuccessStatusCode);
}
}
}
}