bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-21 10:43:44 +00:00
Code Issues Releases Wiki Activity

[deps]: Update Divergic.Logging.Xunit to 4.3.1 (#4821)

Browse Source 
* [deps]: Update Divergic.Logging.Xunit to 4.3.1

* Switch to Neovolve.Logging.Xunit and clean up test file

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Co-authored-by: Alex Morask <amorask@bitwarden.com>
This commit is contained in:
renovate[bot]
2025-12-08 12:58:41 -06:00
committed by GitHub
parent 014376b545
commit acc2529353
2 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Billing.Test/Billing.Test.csproj
View File

@@ -5,8 +5,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Divergic.Logging.Xunit" Version="4.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
<PackageReference Include="Neovolve.Logging.Xunit" Version="6.3.0" />
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" /> <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" /> <PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)"> <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">

71
test/Billing.Test/Controllers/PayPalControllerTests.cs
View File

@@ -8,13 +8,13 @@ using Bit.Core.Entities;
using Bit.Core.Enums; using Bit.Core.Enums;
using Bit.Core.Repositories; using Bit.Core.Repositories;
using Bit.Core.Services; using Bit.Core.Services;
using Divergic.Logging.Xunit;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.Extensions.Primitives; using Microsoft.Extensions.Primitives;
using Neovolve.Logging.Xunit;
using NSubstitute; using NSubstitute;
using NSubstitute.ReturnsExtensions; using NSubstitute.ReturnsExtensions;
using Xunit; using Xunit;
@@ -23,10 +23,8 @@ using Transaction = Bit.Core.Entities.Transaction;
namespace Bit.Billing.Test.Controllers; namespace Bit.Billing.Test.Controllers;
public class PayPalControllerTests public class PayPalControllerTests(ITestOutputHelper testOutputHelper)
{ {
private readonly ITestOutputHelper _testOutputHelper;
private readonly IOptions<BillingSettings> _billingSettings = Substitute.For<IOptions<BillingSettings>>(); private readonly IOptions<BillingSettings> _billingSettings = Substitute.For<IOptions<BillingSettings>>();
private readonly IMailService _mailService = Substitute.For<IMailService>(); private readonly IMailService _mailService = Substitute.For<IMailService>();
private readonly IOrganizationRepository _organizationRepository = Substitute.For<IOrganizationRepository>(); private readonly IOrganizationRepository _organizationRepository = Substitute.For<IOrganizationRepository>();
@@ -38,15 +36,10 @@ public class PayPalControllerTests
private const string _defaultWebhookKey = "webhook-key"; private const string _defaultWebhookKey = "webhook-key";
public PayPalControllerTests(ITestOutputHelper testOutputHelper)
{
_testOutputHelper = testOutputHelper;
}
[Fact] [Fact]
public async Task PostIpn_NullKey_BadRequest() public async Task PostIpn_NullKey_BadRequest()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
var controller = ConfigureControllerContextWith(logger, null, null); var controller = ConfigureControllerContextWith(logger, null, null);
@@ -60,7 +53,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_IncorrectKey_BadRequest() public async Task PostIpn_IncorrectKey_BadRequest()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -79,7 +72,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_EmptyIPNBody_BadRequest() public async Task PostIpn_EmptyIPNBody_BadRequest()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -98,7 +91,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_IPNHasNoEntityId_BadRequest() public async Task PostIpn_IPNHasNoEntityId_BadRequest()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -119,15 +112,13 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_OtherTransactionType_Unprocessed_Ok() public async Task PostIpn_OtherTransactionType_Unprocessed_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
PayPal = { WebhookKey = _defaultWebhookKey } PayPal = { WebhookKey = _defaultWebhookKey }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.UnsupportedTransactionType); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.UnsupportedTransactionType);
var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody); var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody);
@@ -142,7 +133,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_MismatchedReceiverID_Unprocessed_Ok() public async Task PostIpn_MismatchedReceiverID_Unprocessed_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -153,8 +144,6 @@ public class PayPalControllerTests
} }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulPayment); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulPayment);
var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody); var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody);
@@ -169,7 +158,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_RefundMissingParent_Unprocessed_Ok() public async Task PostIpn_RefundMissingParent_Unprocessed_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -180,8 +169,6 @@ public class PayPalControllerTests
} }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.RefundMissingParentTransaction); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.RefundMissingParentTransaction);
var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody); var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody);
@@ -196,7 +183,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_eCheckPayment_Unprocessed_Ok() public async Task PostIpn_eCheckPayment_Unprocessed_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -207,8 +194,6 @@ public class PayPalControllerTests
} }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.ECheckPayment); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.ECheckPayment);
var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody); var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody);
@@ -223,7 +208,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_NonUSD_Unprocessed_Ok() public async Task PostIpn_NonUSD_Unprocessed_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -234,8 +219,6 @@ public class PayPalControllerTests
} }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.NonUSDPayment); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.NonUSDPayment);
var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody); var controller = ConfigureControllerContextWith(logger, _defaultWebhookKey, ipnBody);
@@ -250,7 +233,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_Completed_ExistingTransaction_Unprocessed_Ok() public async Task PostIpn_Completed_ExistingTransaction_Unprocessed_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -261,8 +244,6 @@ public class PayPalControllerTests
} }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulPayment); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulPayment);
_transactionRepository.GetByGatewayIdAsync( _transactionRepository.GetByGatewayIdAsync(
@@ -281,7 +262,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_Completed_CreatesTransaction_Ok() public async Task PostIpn_Completed_CreatesTransaction_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -292,8 +273,6 @@ public class PayPalControllerTests
} }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulPayment); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulPayment);
_transactionRepository.GetByGatewayIdAsync( _transactionRepository.GetByGatewayIdAsync(
@@ -314,7 +293,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_Completed_CreatesTransaction_CreditsOrganizationAccount_Ok() public async Task PostIpn_Completed_CreatesTransaction_CreditsOrganizationAccount_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -362,7 +341,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_Completed_CreatesTransaction_CreditsUserAccount_Ok() public async Task PostIpn_Completed_CreatesTransaction_CreditsUserAccount_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -406,7 +385,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_Refunded_ExistingTransaction_Unprocessed_Ok() public async Task PostIpn_Refunded_ExistingTransaction_Unprocessed_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -417,8 +396,6 @@ public class PayPalControllerTests
} }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulRefund); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulRefund);
_transactionRepository.GetByGatewayIdAsync( _transactionRepository.GetByGatewayIdAsync(
@@ -441,7 +418,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_Refunded_MissingParentTransaction_Ok() public async Task PostIpn_Refunded_MissingParentTransaction_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -452,8 +429,6 @@ public class PayPalControllerTests
} }
}); });
var organizationId = new Guid("ca8c6f2b-2d7b-4639-809f-b0e5013a304e");
var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulRefund); var ipnBody = await PayPalTestIPN.GetAsync(IPNBody.SuccessfulRefund);
_transactionRepository.GetByGatewayIdAsync( _transactionRepository.GetByGatewayIdAsync(
@@ -480,7 +455,7 @@ public class PayPalControllerTests
[Fact] [Fact]
public async Task PostIpn_Refunded_ReplacesParent_CreatesTransaction_Ok() public async Task PostIpn_Refunded_ReplacesParent_CreatesTransaction_Ok()
{ {
var logger = _testOutputHelper.BuildLoggerFor<PayPalController>(); var logger = testOutputHelper.BuildLoggerFor<PayPalController>();
_billingSettings.Value.Returns(new BillingSettings _billingSettings.Value.Returns(new BillingSettings
{ {
@@ -531,8 +506,8 @@ public class PayPalControllerTests
private PayPalController ConfigureControllerContextWith( private PayPalController ConfigureControllerContextWith(
ILogger<PayPalController> logger, ILogger<PayPalController> logger,
string webhookKey, string? webhookKey,
string ipnBody) string? ipnBody)
{ {
var controller = new PayPalController( var controller = new PayPalController(
_billingSettings, _billingSettings,
@@ -578,16 +553,16 @@ public class PayPalControllerTests
Assert.Equal(statusCode, statusCodeActionResult.StatusCode); Assert.Equal(statusCode, statusCodeActionResult.StatusCode);
} }
private static void Logged(ICacheLogger logger, LogLevel logLevel, string message) private static void Logged(ICacheLogger<PayPalController> logger, LogLevel logLevel, string message)
{ {
Assert.NotNull(logger.Last); Assert.NotNull(logger.Last);
Assert.Equal(logLevel, logger.Last!.LogLevel); Assert.Equal(logLevel, logger.Last!.LogLevel);
Assert.Equal(message, logger.Last!.Message); Assert.Equal(message, logger.Last!.Message);
} }
private static void LoggedError(ICacheLogger logger, string message) private static void LoggedError(ICacheLogger<PayPalController> logger, string message)
=> Logged(logger, LogLevel.Error, message); => Logged(logger, LogLevel.Error, message);
private static void LoggedWarning(ICacheLogger logger, string message) private static void LoggedWarning(ICacheLogger<PayPalController> logger, string message)
=> Logged(logger, LogLevel.Warning, message); => Logged(logger, LogLevel.Warning, message);
} }