diff --git a/src/Atc.Azure.Messaging/EventHub/EventHubCredentialsPublisherFactory.cs b/src/Atc.Azure.Messaging/EventHub/EventHubCredentialsPublisherFactory.cs index 7bcc625..5161e1e 100644 --- a/src/Atc.Azure.Messaging/EventHub/EventHubCredentialsPublisherFactory.cs +++ b/src/Atc.Azure.Messaging/EventHub/EventHubCredentialsPublisherFactory.cs @@ -1,11 +1,3 @@ -using System.Diagnostics.CodeAnalysis; -using Atc.Azure.Options.Authorization; -using Atc.Azure.Options.Environment; -using Atc.Azure.Options.EventHub; -using Atc.Azure.Options.Providers; -using Azure.Identity; -using Azure.Messaging.EventHubs.Producer; - namespace Atc.Azure.Messaging.EventHub; [SuppressMessage( diff --git a/src/Atc.Azure.Messaging/EventHub/EventHubPublisher.cs b/src/Atc.Azure.Messaging/EventHub/EventHubPublisher.cs index cfb4af8..46a354e 100644 --- a/src/Atc.Azure.Messaging/EventHub/EventHubPublisher.cs +++ b/src/Atc.Azure.Messaging/EventHub/EventHubPublisher.cs @@ -1,8 +1,3 @@ -using System.Text; -using System.Text.Json; -using Azure.Messaging.EventHubs; -using Azure.Messaging.EventHubs.Producer; - namespace Atc.Azure.Messaging.EventHub; internal sealed class EventHubPublisher : IEventHubPublisher diff --git a/src/Atc.Azure.Messaging/EventHub/EventHubPublisherFactory.cs b/src/Atc.Azure.Messaging/EventHub/EventHubPublisherFactory.cs index 87eda45..fbc66fe 100644 --- a/src/Atc.Azure.Messaging/EventHub/EventHubPublisherFactory.cs +++ b/src/Atc.Azure.Messaging/EventHub/EventHubPublisherFactory.cs @@ -1,7 +1,3 @@ -using System.Diagnostics.CodeAnalysis; -using Atc.Azure.Options.EventHub; -using Azure.Messaging.EventHubs.Producer; - namespace Atc.Azure.Messaging.EventHub; [SuppressMessage( diff --git a/src/Atc.Azure.Messaging/GlobalUsings.cs b/src/Atc.Azure.Messaging/GlobalUsings.cs new file mode 100644 index 0000000..15176f9 --- /dev/null +++ b/src/Atc.Azure.Messaging/GlobalUsings.cs @@ -0,0 +1,20 @@ +global using System.Collections.Concurrent; +global using System.Diagnostics.CodeAnalysis; +global using System.Text; +global using System.Text.Json; + +global using Atc.Azure.Messaging.EventHub; +global using Atc.Azure.Messaging.ServiceBus; +global using Atc.Azure.Options.Authorization; +global using Atc.Azure.Options.Environment; +global using Atc.Azure.Options.EventHub; +global using Atc.Azure.Options.Providers; +global using Atc.Azure.Options.ServiceBus; + +global using Azure.Identity; +global using Azure.Messaging.EventHubs; +global using Azure.Messaging.EventHubs.Producer; +global using Azure.Messaging.ServiceBus; + +global using Microsoft.Extensions.Configuration; +global using Microsoft.Extensions.DependencyInjection.Extensions; \ No newline at end of file diff --git a/src/Atc.Azure.Messaging/ServiceBus/IServiceBusClientFactory.cs b/src/Atc.Azure.Messaging/ServiceBus/IServiceBusClientFactory.cs index 463e7b9..87359c1 100644 --- a/src/Atc.Azure.Messaging/ServiceBus/IServiceBusClientFactory.cs +++ b/src/Atc.Azure.Messaging/ServiceBus/IServiceBusClientFactory.cs @@ -1,5 +1,3 @@ -using Azure.Messaging.ServiceBus; - namespace Atc.Azure.Messaging.ServiceBus; internal interface IServiceBusClientFactory diff --git a/src/Atc.Azure.Messaging/ServiceBus/IServiceBusSenderProvider.cs b/src/Atc.Azure.Messaging/ServiceBus/IServiceBusSenderProvider.cs index 4c6e71d..0ef0ee5 100644 --- a/src/Atc.Azure.Messaging/ServiceBus/IServiceBusSenderProvider.cs +++ b/src/Atc.Azure.Messaging/ServiceBus/IServiceBusSenderProvider.cs @@ -1,5 +1,3 @@ -using Azure.Messaging.ServiceBus; - namespace Atc.Azure.Messaging.ServiceBus; internal interface IServiceBusSenderProvider diff --git a/src/Atc.Azure.Messaging/ServiceBus/ServiceBusClientFactory.cs b/src/Atc.Azure.Messaging/ServiceBus/ServiceBusClientFactory.cs index d7c9c5f..0eae945 100644 --- a/src/Atc.Azure.Messaging/ServiceBus/ServiceBusClientFactory.cs +++ b/src/Atc.Azure.Messaging/ServiceBus/ServiceBusClientFactory.cs @@ -1,6 +1,3 @@ -using Atc.Azure.Options.ServiceBus; -using Azure.Messaging.ServiceBus; - namespace Atc.Azure.Messaging.ServiceBus; internal sealed class ServiceBusClientFactory : IServiceBusClientFactory diff --git a/src/Atc.Azure.Messaging/ServiceBus/ServiceBusCredentialsClientFactory.cs b/src/Atc.Azure.Messaging/ServiceBus/ServiceBusCredentialsClientFactory.cs index 6f67eee..92c139d 100644 --- a/src/Atc.Azure.Messaging/ServiceBus/ServiceBusCredentialsClientFactory.cs +++ b/src/Atc.Azure.Messaging/ServiceBus/ServiceBusCredentialsClientFactory.cs @@ -1,10 +1,3 @@ -using Atc.Azure.Options.Authorization; -using Atc.Azure.Options.Environment; -using Atc.Azure.Options.Providers; -using Atc.Azure.Options.ServiceBus; -using Azure.Identity; -using Azure.Messaging.ServiceBus; - namespace Atc.Azure.Messaging.ServiceBus; internal sealed class ServiceBusCredentialsClientFactory : IServiceBusClientFactory diff --git a/src/Atc.Azure.Messaging/ServiceBus/ServiceBusPublisher.cs b/src/Atc.Azure.Messaging/ServiceBus/ServiceBusPublisher.cs index 557304d..6e4e74f 100644 --- a/src/Atc.Azure.Messaging/ServiceBus/ServiceBusPublisher.cs +++ b/src/Atc.Azure.Messaging/ServiceBus/ServiceBusPublisher.cs @@ -1,6 +1,3 @@ -using System.Text.Json; -using Azure.Messaging.ServiceBus; - namespace Atc.Azure.Messaging.ServiceBus; internal sealed class ServiceBusPublisher : IServiceBusPublisher diff --git a/src/Atc.Azure.Messaging/ServiceBus/ServiceBusSenderProvider.cs b/src/Atc.Azure.Messaging/ServiceBus/ServiceBusSenderProvider.cs index 067d500..81dbe74 100644 --- a/src/Atc.Azure.Messaging/ServiceBus/ServiceBusSenderProvider.cs +++ b/src/Atc.Azure.Messaging/ServiceBus/ServiceBusSenderProvider.cs @@ -1,6 +1,3 @@ -using System.Collections.Concurrent; -using Azure.Messaging.ServiceBus; - namespace Atc.Azure.Messaging.ServiceBus; internal sealed class ServiceBusSenderProvider : IServiceBusSenderProvider diff --git a/src/Atc.Azure.Messaging/ServiceCollectionExtensions.cs b/src/Atc.Azure.Messaging/ServiceCollectionExtensions.cs index badd217..4f40d72 100644 --- a/src/Atc.Azure.Messaging/ServiceCollectionExtensions.cs +++ b/src/Atc.Azure.Messaging/ServiceCollectionExtensions.cs @@ -1,15 +1,3 @@ -using System.Diagnostics.CodeAnalysis; -using Atc.Azure.Messaging.EventHub; -using Atc.Azure.Messaging.ServiceBus; -using Atc.Azure.Options.Authorization; -using Atc.Azure.Options.Environment; -using Atc.Azure.Options.EventHub; -using Atc.Azure.Options.Providers; -using Atc.Azure.Options.ServiceBus; -using Azure.Identity; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection.Extensions; - namespace Microsoft.Extensions.DependencyInjection; [ExcludeFromCodeCoverage] diff --git a/test/Atc.Azure.Messaging.Tests/EventHub/EventHubCredentialsPublisherFactoryTests.cs b/test/Atc.Azure.Messaging.Tests/EventHub/EventHubCredentialsPublisherFactoryTests.cs index 4cfe2dc..cdf412f 100644 --- a/test/Atc.Azure.Messaging.Tests/EventHub/EventHubCredentialsPublisherFactoryTests.cs +++ b/test/Atc.Azure.Messaging.Tests/EventHub/EventHubCredentialsPublisherFactoryTests.cs @@ -1,9 +1,3 @@ -using Atc.Azure.Messaging.EventHub; -using Atc.Azure.Options.Authorization; -using Atc.Azure.Options.Environment; -using Atc.Azure.Options.EventHub; -using Atc.Azure.Options.Providers; - namespace Atc.Azure.Messaging.Tests.EventHub; public class EventHubCredentialsPublisherFactoryTests diff --git a/test/Atc.Azure.Messaging.Tests/EventHub/EventHubPublisherFactoryTests.cs b/test/Atc.Azure.Messaging.Tests/EventHub/EventHubPublisherFactoryTests.cs index bb0e245..320d204 100644 --- a/test/Atc.Azure.Messaging.Tests/EventHub/EventHubPublisherFactoryTests.cs +++ b/test/Atc.Azure.Messaging.Tests/EventHub/EventHubPublisherFactoryTests.cs @@ -1,6 +1,3 @@ -using Atc.Azure.Messaging.EventHub; -using Atc.Azure.Options.EventHub; - namespace Atc.Azure.Messaging.Tests.EventHub; public class EventHubPublisherFactoryTests diff --git a/test/Atc.Azure.Messaging.Tests/EventHub/EventHubPublisherTests.cs b/test/Atc.Azure.Messaging.Tests/EventHub/EventHubPublisherTests.cs index fc85365..745c10d 100644 --- a/test/Atc.Azure.Messaging.Tests/EventHub/EventHubPublisherTests.cs +++ b/test/Atc.Azure.Messaging.Tests/EventHub/EventHubPublisherTests.cs @@ -1,10 +1,3 @@ -using System.Text; -using System.Text.Json; -using Atc.Azure.Messaging.EventHub; -using AutoFixture.AutoNSubstitute; -using Azure.Messaging.EventHubs; -using Azure.Messaging.EventHubs.Producer; - namespace Atc.Azure.Messaging.Tests.EventHub; public class EventHubPublisherTests diff --git a/test/Atc.Azure.Messaging.Tests/GlobalUsings.cs b/test/Atc.Azure.Messaging.Tests/GlobalUsings.cs new file mode 100644 index 0000000..6b3097d --- /dev/null +++ b/test/Atc.Azure.Messaging.Tests/GlobalUsings.cs @@ -0,0 +1,19 @@ +global using System.Text; +global using System.Text.Json; + +global using Atc.Azure.Messaging.EventHub; +global using Atc.Azure.Messaging.ServiceBus; +global using Atc.Azure.Options.Authorization; +global using Atc.Azure.Options.Environment; +global using Atc.Azure.Options.EventHub; +global using Atc.Azure.Options.Providers; +global using Atc.Azure.Options.ServiceBus; + +global using AutoFixture.AutoNSubstitute; + +global using Azure.Messaging.EventHubs; +global using Azure.Messaging.EventHubs.Producer; +global using Azure.Messaging.ServiceBus; + +global using Microsoft.Extensions.Configuration; +global using Microsoft.Extensions.DependencyInjection; \ No newline at end of file diff --git a/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusClientFactoryTests.cs b/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusClientFactoryTests.cs index a7f0325..7b6d9af 100644 --- a/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusClientFactoryTests.cs +++ b/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusClientFactoryTests.cs @@ -1,7 +1,4 @@ -using Atc.Azure.Messaging.ServiceBus; -using Atc.Azure.Options.ServiceBus; - -namespace Atc.Azure.Messaging.Tests.ServiceBus; +namespace Atc.Azure.Messaging.Tests.ServiceBus; public class ServiceBusClientFactoryTests { diff --git a/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusCredentialsClientFactoryTests.cs b/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusCredentialsClientFactoryTests.cs index aee7fdb..47bf107 100644 --- a/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusCredentialsClientFactoryTests.cs +++ b/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusCredentialsClientFactoryTests.cs @@ -1,9 +1,3 @@ -using Atc.Azure.Messaging.ServiceBus; -using Atc.Azure.Options.Authorization; -using Atc.Azure.Options.Environment; -using Atc.Azure.Options.Providers; -using Atc.Azure.Options.ServiceBus; - namespace Atc.Azure.Messaging.Tests.ServiceBus; public class ServiceBusCredentialsClientFactoryTests diff --git a/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusPublisherTests.cs b/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusPublisherTests.cs index 49440af..be3615e 100644 --- a/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusPublisherTests.cs +++ b/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusPublisherTests.cs @@ -1,132 +1,126 @@ -using System.Text.Json; -using Atc.Azure.Messaging.ServiceBus; -using AutoFixture.AutoNSubstitute; -using Azure.Messaging.ServiceBus; +namespace Atc.Azure.Messaging.Tests.ServiceBus; -namespace Atc.Azure.Messaging.Tests.ServiceBus +public class ServiceBusPublisherTests { - public class ServiceBusPublisherTests + [Theory, AutoNSubstituteData] + internal async Task Should_Get_ServiceBusSender_For_Topic( + [Frozen] IServiceBusSenderProvider provider, + ServiceBusPublisher sut, + [Substitute] ServiceBusSender sender, + string topicName, + object messageBody, + IDictionary properties, + TimeSpan timeToLive, + string sessionId, + CancellationToken cancellationToken) { - [Theory, AutoNSubstituteData] - internal async Task Should_Get_ServiceBusSender_For_Topic( - [Frozen] IServiceBusSenderProvider provider, - ServiceBusPublisher sut, - [Substitute] ServiceBusSender sender, - string topicName, - object messageBody, - IDictionary properties, - TimeSpan timeToLive, - string sessionId, - CancellationToken cancellationToken) - { - provider - .GetSender(default!) - .ReturnsForAnyArgs(sender); + provider + .GetSender(default!) + .ReturnsForAnyArgs(sender); - await sut.PublishAsync( - topicName, - messageBody, - sessionId, - properties, - timeToLive, - cancellationToken); + await sut.PublishAsync( + topicName, + messageBody, + sessionId, + properties, + timeToLive, + cancellationToken); - _ = provider - .Received(1) - .GetSender(topicName); - } + _ = provider + .Received(1) + .GetSender(topicName); + } - [Theory, AutoNSubstituteData] - internal async Task Should_Send_Message_On_ServiceBusSender( - [Frozen] IServiceBusSenderProvider provider, - ServiceBusPublisher sut, - [Substitute] ServiceBusSender sender, - string topicName, - object messageBody, - IDictionary properties, - TimeSpan timeToLive, - string sessionId, - CancellationToken cancellationToken) - { - provider - .GetSender(topicName) - .Returns(sender); + [Theory, AutoNSubstituteData] + internal async Task Should_Send_Message_On_ServiceBusSender( + [Frozen] IServiceBusSenderProvider provider, + ServiceBusPublisher sut, + [Substitute] ServiceBusSender sender, + string topicName, + object messageBody, + IDictionary properties, + TimeSpan timeToLive, + string sessionId, + CancellationToken cancellationToken) + { + provider + .GetSender(topicName) + .Returns(sender); - await sut.PublishAsync( - topicName, - messageBody, - sessionId, - properties, - timeToLive, - cancellationToken); + await sut.PublishAsync( + topicName, + messageBody, + sessionId, + properties, + timeToLive, + cancellationToken); - _ = sender - .Received(1) - .SendMessageAsync( - Arg.Any(), - cancellationToken); + _ = sender + .Received(1) + .SendMessageAsync( + Arg.Any(), + cancellationToken); - var message = sender - .ReceivedCallWithArgument(); + var message = sender + .ReceivedCallWithArgument(); - message.MessageId - .Should() - .NotBeNullOrEmpty(); - message.Body - .ToString() - .Should() - .BeEquivalentTo(JsonSerializer.Serialize(messageBody)); - message.ApplicationProperties - .Should() - .BeEquivalentTo(properties); - message.TimeToLive - .Should() - .Be(timeToLive); - } + message.MessageId + .Should() + .NotBeNullOrEmpty(); + message.Body + .ToString() + .Should() + .BeEquivalentTo(JsonSerializer.Serialize(messageBody)); + message.ApplicationProperties + .Should() + .BeEquivalentTo(properties); + message.TimeToLive + .Should() + .Be(timeToLive); + } - [Theory, AutoNSubstituteData] - internal async Task Should_Handle_Default_Parameters( - [Frozen] IServiceBusSenderProvider provider, - ServiceBusPublisher sut, - [Substitute] ServiceBusSender sender, - string topicName, - object messageBody, - string sessionId) - { - provider - .GetSender(topicName) - .Returns(sender); + [Theory, AutoNSubstituteData] + internal async Task Should_Handle_Default_Parameters( + [Frozen] IServiceBusSenderProvider provider, + ServiceBusPublisher sut, + [Substitute] ServiceBusSender sender, + string topicName, + object messageBody, + string sessionId) + { + provider + .GetSender(topicName) + .Returns(sender); - await sut.PublishAsync( - topicName, - messageBody, - sessionId); + await sut.PublishAsync( + topicName, + messageBody, + sessionId); - _ = sender - .Received(1) - .SendMessageAsync( - Arg.Any(), - CancellationToken.None); + _ = sender + .Received(1) + .SendMessageAsync( + Arg.Any(), + CancellationToken.None); - var message = sender - .ReceivedCallWithArgument(); + var message = sender + .ReceivedCallWithArgument(); - message.MessageId - .Should() - .NotBeNullOrEmpty(); - message.SessionId - .Should() - .NotBeNullOrEmpty(); - message.Body - .ToString() - .Should() - .BeEquivalentTo(JsonSerializer.Serialize(messageBody)); - message.ApplicationProperties - .Should() - .BeEmpty(); - message.TimeToLive - .Should() - .Be(TimeSpan.MaxValue); - } + message.MessageId + .Should() + .NotBeNullOrEmpty(); + message.SessionId + .Should() + .NotBeNullOrEmpty(); + message.Body + .ToString() + .Should() + .BeEquivalentTo(JsonSerializer.Serialize(messageBody)); + message.ApplicationProperties + .Should() + .BeEmpty(); + message.TimeToLive + .Should() + .Be(TimeSpan.MaxValue); } } \ No newline at end of file diff --git a/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusSenderProviderTests.cs b/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusSenderProviderTests.cs index bdb3a17..a0ecef4 100644 --- a/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusSenderProviderTests.cs +++ b/test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusSenderProviderTests.cs @@ -1,65 +1,61 @@ -using Atc.Azure.Messaging.ServiceBus; -using Azure.Messaging.ServiceBus; +namespace Atc.Azure.Messaging.Tests.ServiceBus; -namespace Atc.Azure.Messaging.Tests.ServiceBus +public sealed class ServiceBusSenderProviderTests { - public sealed class ServiceBusSenderProviderTests - { - private readonly ServiceBusClient client; - private readonly ServiceBusSenderProvider sut; + private readonly ServiceBusClient client; + private readonly ServiceBusSenderProvider sut; - public ServiceBusSenderProviderTests() - { - client = Substitute.For(); - client - .CreateSender(default) - .ReturnsForAnyArgs(Substitute.For()); + public ServiceBusSenderProviderTests() + { + client = Substitute.For(); + client + .CreateSender(default) + .ReturnsForAnyArgs(Substitute.For()); - var factory = Substitute.For(); - factory.Create().Returns(client); + var factory = Substitute.For(); + factory.Create().Returns(client); - sut = new ServiceBusSenderProvider(factory); - } + sut = new ServiceBusSenderProvider(factory); + } - [Theory, AutoData] - public void Get_CreatesSender_On_Client( - string topicName) - { - sut.GetSender(topicName); + [Theory, AutoData] + public void Get_CreatesSender_On_Client( + string topicName) + { + sut.GetSender(topicName); - client - .Received(1) - .CreateSender(topicName); - } + client + .Received(1) + .CreateSender(topicName); + } - [Theory, AutoData] - public void Get_Returns_ServiceBusSender( - string topicName) - => sut.GetSender(topicName) - .Should() - .BeAssignableTo(); + [Theory, AutoData] + public void Get_Returns_ServiceBusSender( + string topicName) + => sut.GetSender(topicName) + .Should() + .BeAssignableTo(); - [Theory, AutoData] - public void Get_Reuses_Sender_For_Same_TopicName( - string topicName) - { - sut.GetSender(topicName); - sut.GetSender(topicName); - client - .ReceivedWithAnyArgs(1) - .CreateSender(default); - } + [Theory, AutoData] + public void Get_Reuses_Sender_For_Same_TopicName( + string topicName) + { + sut.GetSender(topicName); + sut.GetSender(topicName); + client + .ReceivedWithAnyArgs(1) + .CreateSender(default); + } - [Theory, AutoData] - public void Get_Creates_New_Senders_For_Different_TopicName( - string topicName1, - string topicName2) - { - sut.GetSender(topicName1); - sut.GetSender(topicName2); - client - .ReceivedWithAnyArgs(2) - .CreateSender(default); - } + [Theory, AutoData] + public void Get_Creates_New_Senders_For_Different_TopicName( + string topicName1, + string topicName2) + { + sut.GetSender(topicName1); + sut.GetSender(topicName2); + client + .ReceivedWithAnyArgs(2) + .CreateSender(default); } } \ No newline at end of file diff --git a/test/Atc.Azure.Messaging.Tests/ServiceCollectionExtensionsTests.cs b/test/Atc.Azure.Messaging.Tests/ServiceCollectionExtensionsTests.cs index f8b6ca0..be7325d 100644 --- a/test/Atc.Azure.Messaging.Tests/ServiceCollectionExtensionsTests.cs +++ b/test/Atc.Azure.Messaging.Tests/ServiceCollectionExtensionsTests.cs @@ -1,9 +1,3 @@ -using Atc.Azure.Messaging.EventHub; -using Atc.Azure.Messaging.ServiceBus; -using Atc.Azure.Options.Providers; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - namespace Atc.Azure.Messaging.Tests; public class ServiceCollectionExtensionsTests