Parcourir la source

Fixes unit test.

master
savorboard il y a 2 ans
Parent
révision
c4199b5bd0
6 fichiers modifiés avec 22 ajouts et 8 suppressions
  1. +6
    -0
      src/DotNetCore.CAP/Internal/IBootstrapper.Default.cs
  2. +2
    -3
      src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs
  3. +3
    -3
      test/DotNetCore.CAP.Test/HelperTest.cs
  4. +1
    -0
      test/DotNetCore.CAP.Test/IntegrationTests/CancellationTokenSubscriberTest.cs
  5. +5
    -1
      test/DotNetCore.CAP.Test/SubscribeInvokerTest.cs
  6. +5
    -1
      test/DotNetCore.CAP.Test/SubscribeInvokerWithCancellation.cs

+ 6
- 0
src/DotNetCore.CAP/Internal/IBootstrapper.Default.cs Voir le fichier

@@ -20,6 +20,7 @@ namespace DotNetCore.CAP.Internal
private readonly IServiceProvider _serviceProvider;
private readonly ILogger<Bootstrapper> _logger;
private readonly CancellationTokenSource _cts = new ();
private bool _disposed;
private IEnumerable<IProcessingServer> _processors = default!;

public Bootstrapper(IServiceProvider serviceProvider, ILogger<Bootstrapper> logger)
@@ -93,8 +94,13 @@ namespace DotNetCore.CAP.Internal

public override void Dispose()
{
if (_disposed)
{
return;
}
_cts.Cancel();
_cts.Dispose();
_disposed = true;
}

protected override async Task ExecuteAsync(CancellationToken stoppingToken)


+ 2
- 3
src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs Voir le fichier

@@ -31,7 +31,7 @@ namespace DotNetCore.CAP.Internal
private IDataStorage _storage = default!;

private MethodMatcherCache _selector = default!;
private CancellationTokenSource _cts;
private CancellationTokenSource _cts = new();
private BrokerAddress _serverAddress;
private Task? _compositeTask;
private bool _disposed;
@@ -47,7 +47,6 @@ namespace DotNetCore.CAP.Internal
_logger = logger;
_serviceProvider = serviceProvider;
_options = serviceProvider.GetRequiredService<IOptions<CapOptions>>().Value;
_cts = new CancellationTokenSource();
}

public bool IsHealthy()
@@ -63,7 +62,7 @@ namespace DotNetCore.CAP.Internal
_storage = _serviceProvider.GetRequiredService<IDataStorage>();
_consumerClientFactory = _serviceProvider.GetRequiredService<IConsumerClientFactory>();

stoppingToken.Register(() => _cts.Cancel());
stoppingToken.Register(Dispose);

Execute();
}


+ 3
- 3
test/DotNetCore.CAP.Test/HelperTest.cs Voir le fichier

@@ -11,13 +11,13 @@ namespace DotNetCore.CAP.Test
public void ToTimestampTest()
{
//Arrange
var time = DateTime.Parse("2018-01-01 00:00:00");
var time = DateTimeOffset.Parse("2018-01-01T00:00:00Z");

//Act
var result = Helper.ToTimestamp(time);
var result = Helper.ToTimestamp(time.DateTime);

//Assert
Assert.Equal(1514764800, result);
Assert.Equal(1514736000, result);
}

[Fact]


+ 1
- 0
test/DotNetCore.CAP.Test/IntegrationTests/CancellationTokenSubscriberTest.cs Voir le fichier

@@ -25,6 +25,7 @@ namespace DotNetCore.CAP.Test.IntegrationTests

// Explicitly stop Bootstrapper to prove the cancellation token works.
var bootstrapper = Container.GetRequiredService<Bootstrapper>();
await bootstrapper.StopAsync(CancellationToken.None);

var (message, token) = HandledMessages


+ 5
- 1
test/DotNetCore.CAP.Test/SubscribeInvokerTest.cs Voir le fichier

@@ -37,7 +37,11 @@ namespace DotNetCore.CAP.Test
Parameters = new List<ParameterDescriptor>()
};

var header = new Dictionary<string, string>();
var header = new Dictionary<string, string>()
{
[Headers.MessageId] = SnowflakeId.Default().NextId().ToString(),
[Headers.MessageName] = "fake.output.integer"
};
var message = new Message(header, null);
var context = new ConsumerContext(descriptor, message);



+ 5
- 1
test/DotNetCore.CAP.Test/SubscribeInvokerWithCancellation.cs Voir le fichier

@@ -47,7 +47,11 @@ namespace DotNetCore.CAP.Test
}
};

var header = new Dictionary<string, string>();
var header = new Dictionary<string, string>()
{
[Headers.MessageId] = SnowflakeId.Default().NextId().ToString(),
[Headers.MessageName] = "fake.output.withcancellation"
};
var message = new Message(header, null);
var context = new ConsumerContext(descriptor, message);



Chargement…
Annuler
Enregistrer