Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/BuslyCLI.Console/BuslyCLI.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.8" />
<PackageReference Include="NServiceBus" Version="10.1.4" />
<PackageReference Include="NServiceBus" Version="10.2.0" />
<PackageReference Include="NServiceBus.AmazonSQS" Version="9.0.1" />
<PackageReference Include="NServiceBus.RabbitMQ" Version="11.2.1" />
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="6.3.0" />
Expand Down
1 change: 1 addition & 0 deletions tests/BuslyCLI.Console.Tests/BuslyCLI.Console.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NServiceBus.AmazonSQS" Version="9.0.1" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="4.1.0" />
<PackageReference Include="NServiceBus.Heartbeat" Version="6.0.1" />
<PackageReference Include="NServiceBus.RabbitMQ" Version="11.2.1" />
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="6.3.0" />
Expand Down
18 changes: 12 additions & 6 deletions tests/BuslyCLI.Console.Tests/EndToEnd/ServiceControl/IceBreaker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using BuslyCLI.Console.Tests.TestHelpers;
using DotNet.Testcontainers.Builders;
using DotNet.Testcontainers.Containers;
using Microsoft.Extensions.Hosting;
using Spectre.Console.Testing;
using Testcontainers.RabbitMq;

Expand All @@ -23,6 +24,7 @@ public class IceBreakerTest : CommandTestBase
protected IContainer servicePulse;
protected IContainer serviceControlDb;
protected RabbitMqContainer rabbitMq;
private IHost _endpoint;

[OneTimeSetUp]
public virtual async Task OneTimeSetUp()
Expand Down Expand Up @@ -185,19 +187,23 @@ public virtual async Task OneTimeSetUp()
endpointConfiguration.SendFailedMessagesTo("error");
endpointConfiguration.AuditProcessedMessagesTo("audit");
endpointConfiguration.SendHeartbeatTo("Particular.ServiceControl", TimeSpan.FromSeconds(1));
var endpointInstance = await Endpoint.Start(endpointConfiguration);
var builder = Host.CreateApplicationBuilder();
builder.Services.AddNServiceBusEndpoint(endpointConfiguration);
_endpoint = builder.Build();
await _endpoint.StartAsync().WaitAsync(new TimeSpan(0, 0, 20));
}

[OneTimeTearDown]
public virtual async Task OneTimeTearDown()
{
await _endpoint.StopAsync().WaitAsync(new TimeSpan(0, 0, 20));
_endpoint.Dispose();
await servicePulse.DisposeAsync();
await serviceControlMonitoring.DisposeAsync();
await serviceControl.DisposeAsync();
await serviceControlAudit.DisposeAsync();
await rabbitMq.DisposeAsync();
await serviceControlDb.DisposeAsync();

}

[Test]
Expand All @@ -218,7 +224,7 @@ public void ShouldShowLicense()

// Act
var result = Sut.Run(
"sc",
"servicecontrol",
"license",
"show",
"--config", configFile.FilePath);
Expand All @@ -230,7 +236,7 @@ public void ShouldShowLicense()
┌────────┬───────────────┬──────────┬─────────┬──────────────────────┐
│ Status │ Registered To │ Is Trial │ Edition │ Expiration Date │
├────────┼───────────────┼──────────┼─────────┼──────────────────────┤
│ Valid │ Blinds.com │ No Premium │ 2026-05-23 00:00:00Z │
│ Valid │ │ YES │ Premium │ 2026-06-23 00:00:00Z │
└────────┴───────────────┴──────────┴─────────┴──────────────────────┘
""".NormalizeLineEndings()));
}
Expand All @@ -253,8 +259,8 @@ public void ShouldListEndpoints()

// Act
var result = Sut.Run(
"sc",
"endpoints",
"servicecontrol",
"endpoint",
"list",
"--config", configFile.FilePath);

Expand Down