Skip to content

Commit

Permalink
Add MSMQ back
Browse files Browse the repository at this point in the history
  • Loading branch information
@bording
bording committed Mar 2, 2024
1 parent 5f7d131 commit b47c278
Show file tree
Hide file tree
Showing 16 changed files with 265 additions and 239 deletions.
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
View file
Expand Up @@ -36,7 +36,6 @@
<PackageVersion Include="NServiceBus.Heartbeat" Version="5.0.0" />
<PackageVersion Include="NServiceBus.Metrics" Version="5.0.0" />
<PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="5.0.0" />
<PackageVersion Include="NServiceBus.Metrics.ServiceControl.Msmq" Version="4.0.0" />
<PackageVersion Include="NServiceBus.Newtonsoft.Json" Version="4.0.0" />
<PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="2.0.0" />
<PackageVersion Include="NServiceBus.RabbitMQ" Version="9.0.0" />
Expand All @@ -58,6 +57,7 @@
<PackageVersion Include="ReactiveUI.WPF" Version="19.5.1" />
<PackageVersion Include="ServiceControl.Contracts" Version="4.0.0" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
<PackageVersion Include="System.Management" Version="8.0.0" />
<PackageVersion Include="System.Management.Automation" Version="7.2.18" />
Expand All @@ -69,7 +69,7 @@
</ItemGroup>

<ItemGroup Label="Versions to pin transitive references">
<PackageVersion Include="Microsoft.AspNetCore.JsonPatch " Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ProjectReferences.Transports.props
View file
Expand Up @@ -4,7 +4,7 @@
<ProjectReference Include="..\ServiceControl.Transports.ASBS\ServiceControl.Transports.ASBS.csproj" ReferenceOutputAssembly="false" Private="false" />
<ProjectReference Include="..\ServiceControl.Transports.ASQ\ServiceControl.Transports.ASQ.csproj" ReferenceOutputAssembly="false" Private="false" />
<ProjectReference Include="..\ServiceControl.Transports.Learning\ServiceControl.Transports.Learning.csproj" ReferenceOutputAssembly="false" Private="false" />
<!--<ProjectReference Include="..\ServiceControl.Transports.Msmq\ServiceControl.Transports.Msmq.csproj" ReferenceOutputAssembly="false" Private="false" />-->
<ProjectReference Include="..\ServiceControl.Transports.Msmq\ServiceControl.Transports.Msmq.csproj" ReferenceOutputAssembly="false" Private="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework" />
<ProjectReference Include="..\ServiceControl.Transports.RabbitMQ\ServiceControl.Transports.RabbitMQ.csproj" ReferenceOutputAssembly="false" Private="false" />
<ProjectReference Include="..\ServiceControl.Transports.SqlServer\ServiceControl.Transports.SqlServer.csproj" ReferenceOutputAssembly="false" Private="false" />
<ProjectReference Include="..\ServiceControl.Transports.SQS\ServiceControl.Transports.SQS.csproj" ReferenceOutputAssembly="false" Private="false" />
Expand Down
65 changes: 32 additions & 33 deletions src/ServiceControl.Config.Tests/AddInstance/AddMonitoringInstance/ConnectionString.cs
View file
Expand Up @@ -41,39 +41,38 @@ public static MonitoringAddViewModel When_no_transport_is_selected(this Monitori

class AddMonitoringConnectionStringsTests
{
// TODO uncomment tests when MSMQ is added back
//[Test]
//public void MSMQ_transport_is_selected()
//{
// var viewModel = Given_a_monitoring_instance()
// .When_MSQMQ_transport_is_selected();

// Assert.IsFalse(viewModel.ShowConnectionString);
// Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
// Assert.IsEmpty(viewModel.SampleConnectionString);
// Assert.IsNull(viewModel.TransportWarning);
//}

//[TestAllTransportsExcept("MSMQ")]
//public void Non_MSMQ_transport_is_selected(string transportInfoName)
//{
// var viewModel = Given_a_monitoring_instance()
// .When_a_transport_is_selected(transportInfoName);

// Assert.IsTrue(viewModel.ShowConnectionString);
// StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
// Assert.IsNotEmpty(viewModel.SampleConnectionString);

// if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
// {
// Assert.IsNotNull(viewModel.TransportWarning);
// Assert.IsNotEmpty(viewModel.TransportWarning);
// }
// else
// {
// Assert.IsNull(viewModel.TransportWarning);
// }
//}
[Test]
public void MSMQ_transport_is_selected()
{
var viewModel = Given_a_monitoring_instance()
.When_MSQMQ_transport_is_selected();

Assert.IsFalse(viewModel.ShowConnectionString);
Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
Assert.IsEmpty(viewModel.SampleConnectionString);
Assert.IsNull(viewModel.TransportWarning);
}

[TestAllTransportsExcept("MSMQ")]
public void Non_MSMQ_transport_is_selected(string transportInfoName)
{
var viewModel = Given_a_monitoring_instance()
.When_a_transport_is_selected(transportInfoName);

Assert.IsTrue(viewModel.ShowConnectionString);
StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
Assert.IsNotEmpty(viewModel.SampleConnectionString);

if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
{
Assert.IsNotNull(viewModel.TransportWarning);
Assert.IsNotEmpty(viewModel.TransportWarning);
}
else
{
Assert.IsNull(viewModel.TransportWarning);
}
}

[Test]
public void Screen_Loaded()
Expand Down
65 changes: 32 additions & 33 deletions src/ServiceControl.Config.Tests/AddInstance/ConnectionString.cs
View file
Expand Up @@ -41,39 +41,38 @@ public static ServiceControlAddViewModel When_no_transport_is_selected(this Serv

class AddConnectionStringsTests
{
// TODO uncomment tests when MSMQ is added back
//[Test]
//public void MSMQ_transport_is_selected()
//{
// var viewModel = Given_a_service_control_instance()
// .When_MSQMQ_transport_is_selected();

// Assert.IsFalse(viewModel.ShowConnectionString);
// Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
// Assert.IsEmpty(viewModel.SampleConnectionString);
// Assert.IsNull(viewModel.TransportWarning);
//}

//[TestAllTransportsExcept("MSMQ")]
//public void Non_MSMQ_transport_is_selected(string transportInfoName)
//{
// var viewModel = Given_a_service_control_instance()
// .When_a_transport_is_selected(transportInfoName);

// Assert.IsTrue(viewModel.ShowConnectionString);
// StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
// Assert.IsNotEmpty(viewModel.SampleConnectionString);

// if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
// {
// Assert.IsNotNull(viewModel.TransportWarning);
// Assert.IsNotEmpty(viewModel.TransportWarning);
// }
// else
// {
// Assert.IsNull(viewModel.TransportWarning);
// }
//}
[Test]
public void MSMQ_transport_is_selected()
{
var viewModel = Given_a_service_control_instance()
.When_MSQMQ_transport_is_selected();

Assert.IsFalse(viewModel.ShowConnectionString);
Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
Assert.IsEmpty(viewModel.SampleConnectionString);
Assert.IsNull(viewModel.TransportWarning);
}

[TestAllTransportsExcept("MSMQ")]
public void Non_MSMQ_transport_is_selected(string transportInfoName)
{
var viewModel = Given_a_service_control_instance()
.When_a_transport_is_selected(transportInfoName);

Assert.IsTrue(viewModel.ShowConnectionString);
StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
Assert.IsNotEmpty(viewModel.SampleConnectionString);

if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
{
Assert.IsNotNull(viewModel.TransportWarning);
Assert.IsNotEmpty(viewModel.TransportWarning);
}
else
{
Assert.IsNull(viewModel.TransportWarning);
}
}

[Test]
public void Screen_Loaded()
Expand Down
57 changes: 28 additions & 29 deletions src/ServiceControl.Config.Tests/EditInstance/EditAuditInstance/ConnectionString.cs
View file
Expand Up @@ -40,38 +40,37 @@ public static ServiceControlAuditEditViewModel When_no_transport_is_selected(thi

class EditAuditConnectionStringsTests
{
// TODO uncomment tests when MSMQ is added back
//[Test]
//public void MSMQ_transport_is_selected()
//{
// var viewModel = Given_an_audit_instance()
// .When_MSQMQ_transport_is_selected();
[Test]
public void MSMQ_transport_is_selected()
{
var viewModel = Given_an_audit_instance()
.When_MSQMQ_transport_is_selected();

// Assert.IsFalse(viewModel.ShowConnectionString);
// Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
// Assert.IsEmpty(viewModel.SampleConnectionString);
// Assert.IsNull(viewModel.TransportWarning);
//}
Assert.IsFalse(viewModel.ShowConnectionString);
Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
Assert.IsEmpty(viewModel.SampleConnectionString);
Assert.IsNull(viewModel.TransportWarning);
}

//[TestAllTransportsExcept("MSMQ")]
//public void Non_MSMQ_transport_is_selected(string transportInfoName)
//{
// var viewModel = Given_an_audit_instance()
// .When_a_transport_is_selected(transportInfoName);
[TestAllTransportsExcept("MSMQ")]
public void Non_MSMQ_transport_is_selected(string transportInfoName)
{
var viewModel = Given_an_audit_instance()
.When_a_transport_is_selected(transportInfoName);

// Assert.IsTrue(viewModel.ShowConnectionString);
// StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
// Assert.IsNotEmpty(viewModel.SampleConnectionString);
// if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
// {
// Assert.IsNotNull(viewModel.TransportWarning);
// Assert.IsNotEmpty(viewModel.TransportWarning);
// }
// else
// {
// Assert.IsNull(viewModel.TransportWarning);
// }
//}
Assert.IsTrue(viewModel.ShowConnectionString);
StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
Assert.IsNotEmpty(viewModel.SampleConnectionString);
if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
{
Assert.IsNotNull(viewModel.TransportWarning);
Assert.IsNotEmpty(viewModel.TransportWarning);
}
else
{
Assert.IsNull(viewModel.TransportWarning);
}
}

[Test]
public void Screen_Loaded()
Expand Down
63 changes: 31 additions & 32 deletions src/ServiceControl.Config.Tests/EditInstance/EditErrorInstance/ConnectionString.cs
View file
Expand Up @@ -41,38 +41,37 @@ public static ServiceControlEditViewModel When_no_transport_is_selected(this Ser

class EditErrorConnectionStringsTests
{
// TODO uncomment tests when MSMQ is added back
//[Test]
//public void MSMQ_transport_is_selected()
//{
// var viewModel = Given_a_service_control_instance()
// .When_MSQMQ_transport_is_selected();

// Assert.IsFalse(viewModel.ShowConnectionString);
// Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
// Assert.IsEmpty(viewModel.SampleConnectionString);
// Assert.IsNull(viewModel.TransportWarning);
//}

//[TestAllTransportsExcept("MSMQ")]
//public void Non_MSMQ_transport_is_selected(string transportInfoName)
//{
// var viewModel = Given_a_service_control_instance()
// .When_a_transport_is_selected(transportInfoName);

// Assert.IsTrue(viewModel.ShowConnectionString);
// StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
// Assert.IsNotEmpty(viewModel.SampleConnectionString);
// if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
// {
// Assert.IsNotNull(viewModel.TransportWarning);
// Assert.IsNotEmpty(viewModel.TransportWarning);
// }
// else
// {
// Assert.IsNull(viewModel.TransportWarning);
// }
//}
[Test]
public void MSMQ_transport_is_selected()
{
var viewModel = Given_a_service_control_instance()
.When_MSQMQ_transport_is_selected();

Assert.IsFalse(viewModel.ShowConnectionString);
Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
Assert.IsEmpty(viewModel.SampleConnectionString);
Assert.IsNull(viewModel.TransportWarning);
}

[TestAllTransportsExcept("MSMQ")]
public void Non_MSMQ_transport_is_selected(string transportInfoName)
{
var viewModel = Given_a_service_control_instance()
.When_a_transport_is_selected(transportInfoName);

Assert.IsTrue(viewModel.ShowConnectionString);
StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
Assert.IsNotEmpty(viewModel.SampleConnectionString);
if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
{
Assert.IsNotNull(viewModel.TransportWarning);
Assert.IsNotEmpty(viewModel.TransportWarning);
}
else
{
Assert.IsNull(viewModel.TransportWarning);
}
}

[Test]
public void Screen_Loaded()
Expand Down
63 changes: 31 additions & 32 deletions src/ServiceControl.Config.Tests/EditInstance/EditMonitoringInstance/ConnectionString.cs
View file
Expand Up @@ -41,38 +41,37 @@ public static MonitoringEditViewModel When_no_transport_is_selected(this Monitor

class EditMonitoringConnectionStringsTests
{
// TODO uncomment tests when MSMQ is added back
//[Test]
//public void MSMQ_transport_is_selected()
//{
// var viewModel = Given_a_monitoring_instance()
// .When_MSQMQ_transport_is_selected();

// Assert.IsFalse(viewModel.ShowConnectionString);
// Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
// Assert.IsEmpty(viewModel.SampleConnectionString);
// Assert.IsNull(viewModel.TransportWarning);
//}

//[TestAllTransportsExcept("MSMQ")]
//public void Non_MSMQ_transport_is_selected(string transportInfoName)
//{
// var viewModel = Given_a_monitoring_instance()
// .When_a_transport_is_selected(transportInfoName);

// Assert.IsTrue(viewModel.ShowConnectionString);
// StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
// Assert.IsNotEmpty(viewModel.SampleConnectionString);
// if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
// {
// Assert.IsNotNull(viewModel.TransportWarning);
// Assert.IsNotEmpty(viewModel.TransportWarning);
// }
// else
// {
// Assert.IsNull(viewModel.TransportWarning);
// }
//}
[Test]
public void MSMQ_transport_is_selected()
{
var viewModel = Given_a_monitoring_instance()
.When_MSQMQ_transport_is_selected();

Assert.IsFalse(viewModel.ShowConnectionString);
Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
Assert.IsEmpty(viewModel.SampleConnectionString);
Assert.IsNull(viewModel.TransportWarning);
}

[TestAllTransportsExcept("MSMQ")]
public void Non_MSMQ_transport_is_selected(string transportInfoName)
{
var viewModel = Given_a_monitoring_instance()
.When_a_transport_is_selected(transportInfoName);

Assert.IsTrue(viewModel.ShowConnectionString);
StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
Assert.IsNotEmpty(viewModel.SampleConnectionString);
if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
{
Assert.IsNotNull(viewModel.TransportWarning);
Assert.IsNotEmpty(viewModel.TransportWarning);
}
else
{
Assert.IsNull(viewModel.TransportWarning);
}
}

[Test]
public void Screen_Loaded()
Expand Down

0 comments on commit b47c278

Please sign in to comment.