diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/NServiceBus.CustomChecks.AcceptanceTests.csproj b/src/NServiceBus.CustomChecks.AcceptanceTests/NServiceBus.CustomChecks.AcceptanceTests.csproj index 15bf353..dae23db 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/NServiceBus.CustomChecks.AcceptanceTests.csproj +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/NServiceBus.CustomChecks.AcceptanceTests.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_not_setting_ttl.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_not_setting_ttl.cs index a0943de..62539ec 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_not_setting_ttl.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_not_setting_ttl.cs @@ -26,7 +26,7 @@ public async Task Should_use_four_times_the_interval_value_for_ttl() var message = context.Queue.Dequeue(); var constraint = message.UnicastTransportOperations.First().Properties.DiscardIfNotReceivedBefore; - Assert.AreEqual(TimeSpan.FromSeconds(4), constraint.MaxTime); + Assert.That(constraint.MaxTime, Is.EqualTo(TimeSpan.FromSeconds(4))); } class Context : ScenarioContext diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_in_send_only_endpoint.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_in_send_only_endpoint.cs index d738714..f8a3f2c 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_in_send_only_endpoint.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_in_send_only_endpoint.cs @@ -23,12 +23,12 @@ public async Task Should_send_result_to_service_control() .Done(c => c.WasCalled) .Run(); - Assert.True(context.WasCalled); - Assert.Null(context.FailureReason); - Assert.AreEqual("SuccessfulCustomCheck", context.CustomCheckId); - Assert.AreEqual("CustomCheck", context.Category); + Assert.That(context.WasCalled, Is.True); + Assert.That(context.FailureReason, Is.Null); + Assert.That(context.CustomCheckId, Is.EqualTo("SuccessfulCustomCheck")); + Assert.That(context.Category, Is.EqualTo("CustomCheck")); Assert.That(context.ReportedAt, Is.EqualTo(DateTime.UtcNow).Within(TimeSpan.FromMinutes(3.0))); - Assert.False(context.Headers.ContainsKey(Headers.ReplyToAddress)); + Assert.That(context.Headers.ContainsKey(Headers.ReplyToAddress), Is.False); } class Context : ScenarioContext diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_fails.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_fails.cs index c284a91..41896df 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_fails.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_fails.cs @@ -22,10 +22,10 @@ public async Task Should_send_result_to_service_control() .Done(c => c.WasCalled) .Run(TimeSpan.FromSeconds(10)); - Assert.True(context.WasCalled); - Assert.AreEqual("Some reason", context.FailureReason); - Assert.AreEqual("FailingCustomCheck", context.CustomCheckId); - Assert.AreEqual("CustomCheck", context.Category); + Assert.That(context.WasCalled, Is.True); + Assert.That(context.FailureReason, Is.EqualTo("Some reason")); + Assert.That(context.CustomCheckId, Is.EqualTo("FailingCustomCheck")); + Assert.That(context.Category, Is.EqualTo("CustomCheck")); Assert.That(context.ReportedAt, Is.EqualTo(DateTime.UtcNow).Within(TimeSpan.FromMinutes(3.0))); } diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_fails_periodically.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_fails_periodically.cs index d51b459..bc739c9 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_fails_periodically.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_fails_periodically.cs @@ -22,9 +22,9 @@ public async Task Should_send_result_to_service_control() .Done(c => c.Times >= 2) .Run(); - Assert.AreEqual("Some reason", context.FailureReason); - Assert.AreEqual("FailingCustomCheck", context.CustomCheckId); - Assert.AreEqual("CustomCheck", context.Category); + Assert.That(context.FailureReason, Is.EqualTo("Some reason")); + Assert.That(context.CustomCheckId, Is.EqualTo("FailingCustomCheck")); + Assert.That(context.Category, Is.EqualTo("CustomCheck")); Assert.That(context.ReportedAt, Is.EqualTo(DateTime.UtcNow).Within(TimeSpan.FromMinutes(3.0))); } diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_succeeds.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_succeeds.cs index 6311bf1..e066e2f 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_succeeds.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_succeeds.cs @@ -23,12 +23,12 @@ public async Task Should_send_result_to_service_control() .Done(c => c.WasCalled) .Run(); - Assert.True(context.WasCalled); - Assert.Null(context.FailureReason); - Assert.AreEqual("SuccessfulCustomCheck", context.CustomCheckId); - Assert.AreEqual("CustomCheck", context.Category); + Assert.That(context.WasCalled, Is.True); + Assert.That(context.FailureReason, Is.Null); + Assert.That(context.CustomCheckId, Is.EqualTo("SuccessfulCustomCheck")); + Assert.That(context.Category, Is.EqualTo("CustomCheck")); Assert.That(context.ReportedAt, Is.EqualTo(DateTime.UtcNow).Within(TimeSpan.FromMinutes(3.0))); - Assert.True(context.Headers.ContainsKey(Headers.ReplyToAddress)); + Assert.That(context.Headers.ContainsKey(Headers.ReplyToAddress), Is.True); } class Context : ScenarioContext diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_succeeds_periodically.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_succeeds_periodically.cs index 66546ec..afb5a5f 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_succeeds_periodically.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_registering_custom_check_which_succeeds_periodically.cs @@ -22,9 +22,9 @@ public async Task Should_send_result_to_service_control() .Done(c => c.Times >= 2) .Run(); - Assert.Null(context.FailureReason); - Assert.AreEqual("SuccessfulCustomCheck", context.CustomCheckId); - Assert.AreEqual("CustomCheck", context.Category); + Assert.That(context.FailureReason, Is.Null); + Assert.That(context.CustomCheckId, Is.EqualTo("SuccessfulCustomCheck")); + Assert.That(context.Category, Is.EqualTo("CustomCheck")); Assert.That(context.ReportedAt, Is.EqualTo(DateTime.UtcNow).Within(TimeSpan.FromMinutes(3.0))); } diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_setting_explicit_ttl.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_setting_explicit_ttl.cs index d92adf3..7f0bdee 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_setting_explicit_ttl.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_setting_explicit_ttl.cs @@ -26,7 +26,7 @@ public async Task Should_use_it_for_check_messages() var message = context.Queue.Dequeue(); var constraint = message.UnicastTransportOperations.First().Properties.DiscardIfNotReceivedBefore; - Assert.AreEqual(TimeSpan.FromSeconds(6), constraint.MaxTime); + Assert.That(constraint.MaxTime, Is.EqualTo(TimeSpan.FromSeconds(6))); } class Context : ScenarioContext diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_using_one_time_check.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_using_one_time_check.cs index eea2522..fabcb50 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_using_one_time_check.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_using_one_time_check.cs @@ -26,7 +26,7 @@ public async Task Should_use_infinite_ttl_even_when_explicitly_configured() var message = context.Queue.Dequeue(); var constraint = message.UnicastTransportOperations.First().Properties.DiscardIfNotReceivedBefore; - Assert.AreEqual(TimeSpan.MaxValue, constraint.MaxTime); + Assert.That(constraint.MaxTime, Is.EqualTo(TimeSpan.MaxValue)); } class Context : ScenarioContext diff --git a/src/NServiceBus.CustomChecks.AcceptanceTests/When_using_send_only_endpoint.cs b/src/NServiceBus.CustomChecks.AcceptanceTests/When_using_send_only_endpoint.cs index 71f85dc..cc3de98 100644 --- a/src/NServiceBus.CustomChecks.AcceptanceTests/When_using_send_only_endpoint.cs +++ b/src/NServiceBus.CustomChecks.AcceptanceTests/When_using_send_only_endpoint.cs @@ -23,12 +23,12 @@ public async Task Should_not_include_reply_to_header() .Done(c => c.CustomCheckResult != null) .Run(); - Assert.AreEqual(AcceptanceTesting.Customization.Conventions.EndpointNamingConvention(typeof(CustomCheckEndpoint)), testContext.CustomCheckResult.EndpointName); - Assert.AreEqual(false, testContext.CustomCheckResult.HasFailed); - Assert.AreEqual("CustomCheckInSendOnlyEndpoint", testContext.CustomCheckResult.CustomCheckId); + Assert.That(testContext.CustomCheckResult.EndpointName, Is.EqualTo(AcceptanceTesting.Customization.Conventions.EndpointNamingConvention(typeof(CustomCheckEndpoint)))); + Assert.That(testContext.CustomCheckResult.HasFailed, Is.False); + Assert.That(testContext.CustomCheckResult.CustomCheckId, Is.EqualTo("CustomCheckInSendOnlyEndpoint")); - Assert.AreEqual(typeof(ReportCustomCheckResult).FullName, testContext.CustomCheckResultHeaders[Headers.EnclosedMessageTypes]); - Assert.IsFalse(testContext.CustomCheckResultHeaders.ContainsKey(Headers.ReplyToAddress)); + Assert.That(testContext.CustomCheckResultHeaders[Headers.EnclosedMessageTypes], Is.EqualTo(typeof(ReportCustomCheckResult).FullName)); + Assert.That(testContext.CustomCheckResultHeaders.ContainsKey(Headers.ReplyToAddress), Is.False); } class Context : ScenarioContext diff --git a/src/NServiceBus.CustomChecks.Tests/NServiceBus.CustomChecks.Tests.csproj b/src/NServiceBus.CustomChecks.Tests/NServiceBus.CustomChecks.Tests.csproj index 07db3f0..e3ef6fb 100644 --- a/src/NServiceBus.CustomChecks.Tests/NServiceBus.CustomChecks.Tests.csproj +++ b/src/NServiceBus.CustomChecks.Tests/NServiceBus.CustomChecks.Tests.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/src/NServiceBus.CustomChecks/NServiceBus.CustomChecks.csproj b/src/NServiceBus.CustomChecks/NServiceBus.CustomChecks.csproj index c464179..ba1b920 100644 --- a/src/NServiceBus.CustomChecks/NServiceBus.CustomChecks.csproj +++ b/src/NServiceBus.CustomChecks/NServiceBus.CustomChecks.csproj @@ -11,7 +11,7 @@ - +