Skip to content

Commit 4a4d7ed

Browse files
committed
feat: atualizado frameworks
1 parent 34d8004 commit 4a4d7ed

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

Demo.Worker/Program.cs

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using Microsoft.Extensions.DependencyInjection;
23
using Microsoft.Extensions.Logging;
34

45
namespace Demo.Worker
@@ -8,9 +9,13 @@ class Program
89
static void Main(string[] args)
910
{
1011
var startUp = new Startup();
11-
var logger = startUp.GetService<ILogger<Program>>();
12-
logger.LogInformation("Hello World.");
13-
Console.Read();
12+
13+
using (var scope = startUp.Scope)
14+
{
15+
var logger = startUp.Scope.ServiceProvider.GetRequiredService<ILogger<Program>>();
16+
logger.LogInformation("Hello World.");
17+
Console.Read();
18+
}
1419
}
1520
}
1621
}

Demo.Worker/Startup.cs

+3-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ public class Startup
1111
{
1212
public IConfiguration Configuration { get; }
1313

14-
public ServiceProvider ServiceProvier { get; }
14+
private ServiceProvider ServiceProvier { get; }
15+
16+
public IServiceScope Scope => ServiceProvier.CreateScope();
1517

1618
public Startup()
1719
{
@@ -52,11 +54,5 @@ public Startup()
5254
public void ConfigureServices(IServiceCollection services)
5355
{
5456
}
55-
56-
/// <summary>
57-
/// Obtém um serviço no container de dependências.
58-
/// </summary>
59-
/// <typeparam name="T">Tipo do serviço.</typeparam>
60-
public T GetService<T>() => (T)ServiceProvier.GetService(typeof(T));
6157
}
6258
}

Framework.MessageBroker.Tests/RabbitMQ/Tests.cs

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Framework.MessageBroker.RabbitMQ.Explorer;
33
using Framework.MessageBroker.Tests.RabbitMQ.Messages;
44
using Framework.Test;
5+
using Microsoft.Extensions.DependencyInjection;
56
using Shouldly;
67
using System.Threading;
78
using System.Threading.Tasks;
@@ -16,15 +17,15 @@ public class Tests : BaseTest<Startup>
1617

1718
public Tests()
1819
{
19-
_publisher = GetService<IRabbitMQPublisher>();
20-
_rabbitExplorer = GetService<IRabbitMQExplorer>();
20+
_publisher = Scope.ServiceProvider.GetRequiredService<IRabbitMQPublisher>();
21+
_rabbitExplorer = Scope.ServiceProvider.GetRequiredService<IRabbitMQExplorer>();
2122
}
2223

2324
[Fact]
2425
public async Task PublisheAndConsumeDefault()
2526
{
2627
//Arrange
27-
var subscriber = GetService<IRabbitMQSubscriber>();
28+
var subscriber = Scope.ServiceProvider.GetRequiredService<IRabbitMQSubscriber>();
2829
bool publishWithSuccess = false;
2930
var message = new DefaultMessage
3031
{
@@ -58,7 +59,7 @@ public async Task PublisheAndConsumeDefault()
5859
public async Task PublisheAndConsumeNamed()
5960
{
6061
//Arrange
61-
var subscriber = GetService<IRabbitMQSubscriber>();
62+
var subscriber = Scope.ServiceProvider.GetRequiredService<IRabbitMQSubscriber>();
6263
bool publishWithSuccess = false;
6364
var message = new NamedMessage
6465
{
@@ -93,7 +94,7 @@ public async Task PublisheAndConsumeNamed()
9394
public async Task PublisheAndConsumeDirectExchange()
9495
{
9596
//Arrange
96-
var subscriber = GetService<IRabbitMQSubscriber>();
97+
var subscriber = Scope.ServiceProvider.GetRequiredService<IRabbitMQSubscriber>();
9798
bool publishWithSuccess = false;
9899
var message = new DirectMessage
99100
{
@@ -136,7 +137,7 @@ public async Task PublisheAndConsumeDirectExchange()
136137
public async Task PublisheAndConsumeDefaultGeneratedName()
137138
{
138139
//Arrange
139-
var subscriber = GetService<IRabbitMQSubscriber>();
140+
var subscriber = Scope.ServiceProvider.GetRequiredService<IRabbitMQSubscriber>();
140141
bool publishWithSuccess = false;
141142
var message = new DefaultGeneratedNameMessage
142143
{
@@ -171,7 +172,7 @@ public async Task PublisheAndConsumeDefaultGeneratedName()
171172
public async Task PublisheAndConsumeDirectGeneratedName()
172173
{
173174
//Arrange
174-
var subscriber = GetService<IRabbitMQSubscriber>();
175+
var subscriber = Scope.ServiceProvider.GetRequiredService<IRabbitMQSubscriber>();
175176
bool publishWithSuccess = false;
176177
var message = new DirectedGeneratedNameMessage
177178
{
@@ -214,7 +215,7 @@ public async Task PublisheAndConsumeDirectGeneratedName()
214215
public async Task PublisheAndConsumeDefaultRejectedMessage()
215216
{
216217
//Arrange
217-
var subscriber = GetService<IRabbitMQSubscriber>();
218+
var subscriber = Scope.ServiceProvider.GetRequiredService<IRabbitMQSubscriber>();
218219
bool publishWithSuccess = false;
219220
int count = 0;
220221

Framework.Test/BaseTest.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ public BaseTest()
1212
ServiceProvider = ConfigureService();
1313
}
1414

15-
protected readonly IServiceProvider ServiceProvider;
15+
private IServiceProvider ServiceProvider {get;}
16+
17+
public IServiceScope Scope => ServiceProvider.CreateScope();
1618

1719
private IServiceProvider ConfigureService()
1820
{
@@ -26,10 +28,5 @@ private IServiceProvider ConfigureService()
2628

2729
return services.BuildServiceProvider();
2830
}
29-
30-
public TService GetService<TService>()
31-
{
32-
return ServiceProvider.GetService<TService>();
33-
}
3431
}
3532
}

0 commit comments

Comments
 (0)