Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): bump NUnit from 3.14.0 to 4.0.1 #125

Merged
merged 4 commits into from
Dec 28, 2023
Merged

fix(deps): bump NUnit from 3.14.0 to 4.0.1 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7ee8dd
fix(deps): bump NUnit from 3.14.0 to 4.0.1
dependabot[bot] Dec 4, 2023
d4f38aa
refactor: adjusted tests for breaking change in NUnit
granitdula Dec 27, 2023
c829bad
fix: lint
granitdula Dec 27, 2023
f6850bf
fix: lint format
granitdula Dec 28, 2023
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
88 changes: 52 additions & 36 deletions tests/FactSet.SDK.Utils.Tests/Authentication/ConfidentialClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Net.Http;
Expand All @@ -22,7 +21,8 @@ class ConfidentialClientTests
[SetUp]
public void Setup()
{
_resourcesPath = Path.Join(Directory.GetParent(Directory.GetCurrentDirectory()).Parent.Parent.ToString(), "Resources");
_resourcesPath = Path.Join(Directory.GetParent(Directory.GetCurrentDirectory()).Parent.Parent.ToString(),
"Resources");
_testHttpClientEmptyRes = CreateMockHttp(Path.Join(_resourcesPath, "emptyJson.json"));
_testHttpClientValidRes = CreateMockHttp(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"));
}
Expand All @@ -36,7 +36,7 @@ public async Task CreateAsync_PassNullPath_ThrowsArgumentNullException()
}
catch (Exception e)
{
Assert.AreEqual("Value cannot be null. (Parameter 'configPath')", e.Message);
Assert.That("Value cannot be null. (Parameter 'configPath')", Is.EqualTo(e.Message));
Assert.Throws<ArgumentNullException>(() => throw e);
}
}
Expand All @@ -50,7 +50,7 @@ public async Task CreateAsync_PassingExplicitNull_ThrowsArgumentNullException()
}
catch (Exception e)
{
Assert.AreEqual("Value cannot be null. (Parameter 'config')", e.Message);
Assert.That("Value cannot be null. (Parameter 'config')", Is.EqualTo(e.Message));
Assert.Throws<ArgumentNullException>(() => throw e);
}
}
Expand All @@ -67,7 +67,7 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual("'clientId' cannot be null or empty.", e.Message);
Assert.That("'clientId' cannot be null or empty.", Is.EqualTo(e.Message));
Assert.Throws<ArgumentException>(() => throw e);
}
}
Expand Down Expand Up @@ -103,7 +103,8 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual($"Exception caught when retrieving contents of {Path.Join(_resourcesPath, "badJson.txt")}", e.Message);
Assert.That($"Exception caught when retrieving contents of {Path.Join(_resourcesPath, "badJson.txt")}",
Is.EqualTo(e.Message));
Assert.Throws<ConfigurationException>(() => throw e);
}
}
Expand All @@ -120,7 +121,7 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual($"'clientId' cannot be null or empty.", e.Message);
Assert.That($"'clientId' cannot be null or empty.", Is.EqualTo(e.Message));
Assert.Throws<ArgumentException>(() => throw e);
}
}
Expand All @@ -137,7 +138,7 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual($"'jwk' cannot be null.", e.Message);
Assert.That($"'jwk' cannot be null.", Is.EqualTo(e.Message));
Assert.Throws<ArgumentException>(() => throw e);
}
}
Expand All @@ -154,7 +155,9 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual($"JWK must contain the following items: {string.Join(", ", Constants.CONFIG_JWK_REQUIRED_KEYS)}", e.Message);
Assert.That(
$"JWK must contain the following items: {string.Join(", ", Constants.CONFIG_JWK_REQUIRED_KEYS)}",
Is.EqualTo(e.Message));
Assert.Throws<ConfigurationException>(() => throw e);
}
}
Expand All @@ -171,7 +174,9 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual($"JWK must contain the following items: {string.Join(", ", Constants.CONFIG_JWK_REQUIRED_KEYS)}", e.Message);
Assert.That(
$"JWK must contain the following items: {string.Join(", ", Constants.CONFIG_JWK_REQUIRED_KEYS)}",
Is.EqualTo(e.Message));
Assert.Throws<ConfigurationException>(() => throw e);
}
}
Expand Down Expand Up @@ -203,7 +208,9 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual($"JWK must contain the following items: {string.Join(", ", Constants.CONFIG_JWK_REQUIRED_KEYS)}", e.Message);
Assert.That(
$"JWK must contain the following items: {string.Join(", ", Constants.CONFIG_JWK_REQUIRED_KEYS)}",
Is.EqualTo(e.Message));
Assert.Throws<ConfigurationException>(() => throw e);
}
}
Expand All @@ -220,7 +227,7 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual($"'clientId' cannot be null or empty.", e.Message);
Assert.That($"'clientId' cannot be null or empty.", Is.EqualTo(e.Message));
Assert.Throws<ArgumentException>(() => throw e);
}
}
Expand Down Expand Up @@ -248,8 +255,9 @@ await ConfidentialClient.CreateAsync(
}
catch (Exception e)
{
Assert.AreEqual($"Error retrieving contents from the well_known_uri: {Constants.FACTSET_WELL_KNOWN_URI}", e.Message);
Assert.IsInstanceOf<WellKnownUriException>(e);
Assert.That($"Error retrieving contents from the well_known_uri: {Constants.FACTSET_WELL_KNOWN_URI}",
Is.EqualTo(e.Message));
Assert.That(e, Is.InstanceOf<WellKnownUriException>());
}
}

Expand Down Expand Up @@ -279,7 +287,7 @@ public async Task CreateAsync_PassingValidConfigPathValidConfigJSON_InitialisesW
httpClient: _testHttpClientValidRes
);

Assert.IsInstanceOf<ConfidentialClient>(confidentialClient);
Assert.That(confidentialClient, Is.InstanceOf<ConfidentialClient>());
}
catch (Exception)
{
Expand All @@ -288,22 +296,24 @@ public async Task CreateAsync_PassingValidConfigPathValidConfigJSON_InitialisesW
}

[Test]
public async Task CreateAsync_InitialiseAndCastConfidentialClientToIOAuth2Client_InitialisesAndCastsSuccessfully()
public async Task
CreateAsync_InitialiseAndCastConfidentialClientToIOAuth2Client_InitialisesAndCastsSuccessfully()
{
ConfidentialClient confidentialClient = await ConfidentialClient.CreateAsync(
Path.Join(_resourcesPath, "validConfig.json"),
httpClient: _testHttpClientValidRes
);

Assert.IsInstanceOf<ConfidentialClient>(confidentialClient);
Assert.IsInstanceOf<IOAuth2Client>((IOAuth2Client)confidentialClient);
Assert.That(confidentialClient, Is.InstanceOf<ConfidentialClient>());
Assert.That((IOAuth2Client)confidentialClient, Is.InstanceOf<IOAuth2Client>());
}

[Test]
public async Task GetAccessTokenAsync_CallingGetAccessTokenWithFailedSigning_RaisesSigningJwsException()
{
int expireTime = 100;
HttpClient mockClient = CreateMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"), expireTime);
HttpClient mockClient =
CreateMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"), expireTime);

// validConfig.txt is a valid config format, but invalid for signing a JWT.
ConfidentialClient confidentialClient = await ConfidentialClient.CreateAsync(
Expand All @@ -317,15 +327,16 @@ public async Task GetAccessTokenAsync_CallingGetAccessTokenWithFailedSigning_Rai
}
catch (Exception e)
{
Assert.AreEqual($"Failed signing of the JWS", e.Message);
Assert.That($"Failed signing of the JWS", Is.EqualTo(e.Message));
Assert.Throws<SigningJwsException>(() => throw e);
}
}

[Test]
public async Task GetAccessTokenAsync_CallingGetAccessTokenWithErrorResponse_RaisesAccessTokenException()
{
HttpClient mockClient = CreateErroneousMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"));
HttpClient mockClient =
CreateErroneousMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"));

// validConfig.txt is a valid config format, but invalid for signing a JWT.
ConfidentialClient confidentialClient = await ConfidentialClient.CreateAsync(
Expand All @@ -339,7 +350,7 @@ public async Task GetAccessTokenAsync_CallingGetAccessTokenWithErrorResponse_Rai
}
catch (Exception e)
{
Assert.AreEqual($"Error attempting to get access token", e.Message);
Assert.That($"Error attempting to get access token", Is.EqualTo(e.Message));
Assert.Throws<AccessTokenException>(() => throw e);
}
}
Expand All @@ -348,7 +359,8 @@ public async Task GetAccessTokenAsync_CallingGetAccessTokenWithErrorResponse_Rai
public async Task GetAccessTokenAsync_CallingGetAccessTokenForTheFirstTime_ReturnsNewAccessToken()
{
int expireTime = 100;
HttpClient mockClient = CreateMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"), expireTime);
HttpClient mockClient =
CreateMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"), expireTime);

ConfidentialClient confidentialClient = await ConfidentialClient.CreateAsync(
Path.Join(_resourcesPath, "validConfigGeneratedSample.txt"),
Expand All @@ -357,14 +369,15 @@ public async Task GetAccessTokenAsync_CallingGetAccessTokenForTheFirstTime_Retur

string accessToken = await confidentialClient.GetAccessTokenAsync();

Assert.AreEqual("1234", accessToken);
Assert.That("1234", Is.EqualTo(accessToken));
}

[Test]
public async Task GetAccessTokenAsync_CallingGetAccessTokenTwiceBeforeExpiration_ReturnsSameAccessToken()
{
int expireTime = 100;
HttpClient mockClient = CreateMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"), expireTime);
HttpClient mockClient =
CreateMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"), expireTime);

ConfidentialClient confidentialClient = await ConfidentialClient.CreateAsync(
Path.Join(_resourcesPath, "validConfigGeneratedSample.txt"),
Expand All @@ -373,19 +386,21 @@ public async Task GetAccessTokenAsync_CallingGetAccessTokenTwiceBeforeExpiration

string accessToken = await confidentialClient.GetAccessTokenAsync();

Assert.AreEqual("1234", accessToken);
Assert.That("1234", Is.EqualTo(accessToken));

// Called immediately after the first `GetAccessToken` call, so its within expiration.
accessToken = await confidentialClient.GetAccessTokenAsync();

Assert.AreEqual("1234", accessToken);
Assert.That("1234", Is.EqualTo(accessToken));
}

[Test]
public async Task GetAccessTokenAsync_CallingGetAccessTokenBeforeAndAfterExpiration_ReturnsDifferentAccessTokens()
public async Task
GetAccessTokenAsync_CallingGetAccessTokenBeforeAndAfterExpiration_ReturnsDifferentAccessTokens()
{
int expireTime = 0;
HttpClient mockClient = CreateMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"), expireTime);
HttpClient mockClient =
CreateMockHttpTokenRequest(Path.Join(_resourcesPath, "exampleResponseWellKnownUri.txt"), expireTime);

ConfidentialClient confidentialClient = await ConfidentialClient.CreateAsync(
Path.Join(_resourcesPath, "validConfigGeneratedSample.txt"),
Expand All @@ -394,12 +409,12 @@ public async Task GetAccessTokenAsync_CallingGetAccessTokenBeforeAndAfterExpirat

string accessToken = await confidentialClient.GetAccessTokenAsync();

Assert.AreEqual("1234", accessToken);
Assert.That("1234", Is.EqualTo(accessToken));

// Called after a zero expiration.
accessToken = await confidentialClient.GetAccessTokenAsync();

Assert.AreEqual("4321", accessToken);
Assert.That("4321", Is.EqualTo(accessToken));
}

[Test]
Expand Down Expand Up @@ -441,8 +456,8 @@ public async Task GetAccessTokenAsync_CallingGetAccessTokenWithFailedResponse_Th
}
catch (Exception e)
{
Assert.IsInstanceOf<AccessTokenException>(e);
Assert.AreEqual($"Error attempting to get access token", e.Message);
Assert.That(e, Is.InstanceOf<AccessTokenException>());
Assert.That($"Error attempting to get access token", Is.EqualTo(e.Message));
}
}

Expand Down Expand Up @@ -509,12 +524,14 @@ private static HttpClient CreateMockHttpTokenRequest(string wellKnownUriPath, in
.ReturnsAsync(new HttpResponseMessage()
{
StatusCode = HttpStatusCode.OK,
Content = new StringContent($"{{\"access_token\":\"1234\",\"token_type\":\"Bearer\",\"expires_in\":\"{expireTime}\"}}")
Content = new StringContent(
$"{{\"access_token\":\"1234\",\"token_type\":\"Bearer\",\"expires_in\":\"{expireTime}\"}}")
})
.ReturnsAsync(new HttpResponseMessage()
{
StatusCode = HttpStatusCode.OK,
Content = new StringContent($"{{\"access_token\":\"4321\",\"token_type\":\"Bearer\",\"expires_in\":\"{expireTime}\"}}")
Content = new StringContent(
$"{{\"access_token\":\"4321\",\"token_type\":\"Bearer\",\"expires_in\":\"{expireTime}\"}}")
});

mockHandler
Expand Down Expand Up @@ -552,4 +569,3 @@ private static string GetJsonFromFile(string path)
}
}
}

Loading