Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): upgrade arcus.testing to v1.2 in unit tests #473

Merged
merged 1 commit into from
Feb 11, 2025
Merged

chore(deps): upgrade arcus.testing to v1.2 in unit tests #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Arcus.Messaging.Tests.Unit/Arcus.Messaging.Tests.Unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Arcus.Security.Core" Version="2.0.0" />
<PackageReference Include="Arcus.Testing.Security.Providers.InMemory" Version="0.5.0" />
<PackageReference Include="Arcus.Testing.Logging" Version="0.5.0" />
<PackageReference Include="Arcus.Testing.Logging.Xunit" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="Serilog" Version="2.10.0" />
Expand Down
54 changes: 27 additions & 27 deletions src/Arcus.Messaging.Tests.Unit/EventHubs/EventHubProducerClientExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Arcus.Messaging.Tests.Core.Generators;
using Arcus.Messaging.Tests.Core.Messages.v1;
using Arcus.Messaging.Tests.Unit.EventHubs.Fixture;
using Arcus.Testing.Logging;
using Arcus.Testing;
using Azure.Messaging.EventHubs;
using Azure.Messaging.EventHubs.Producer;
using Azure.Messaging.ServiceBus;
Expand All @@ -34,12 +34,12 @@ public async Task SendMessagesBodyWithoutOptions_WithMessageCorrelation_Succeeds
var logger = new InMemoryLogger();

// Act
await spySender.SendAsync(expectedOrders, correlation, logger);
await spySender.SendAsync(expectedOrders, correlation, logger);

// Assert
AssertDependencyTelemetry(logger);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventData(item.First, item.Second, correlation));
}

Expand All @@ -59,7 +59,7 @@ public async Task SendMessagesBodyWithoutOptions_WithCustomDependencyId_Succeeds
// Assert
AssertDependencyTelemetry(logger, dependencyId);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventDataWithDependencyId(item.First, item.Second, correlation, dependencyId));
}

Expand All @@ -79,7 +79,7 @@ public async Task SendMessagesBodyWithoutOptions_WithCustomTransactionIdProperty
// Assert
AssertDependencyTelemetry(logger);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventData(item.First, item.Second, correlation, transactionIdPropertyName: transactionIdPropertyName));
}

Expand All @@ -99,7 +99,7 @@ public async Task SendMessagesBodyWithoutOptions_WithCustomUpstreamServiceIdProp
// Assert
AssertDependencyTelemetry(logger);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventData(item.First, item.Second, correlation, operationParentPropertyName: upstreamServicePropertyName));
}

Expand All @@ -122,7 +122,7 @@ public async Task SendMessagesBodyWithoutOptions_WithCustomTelemetryContext_Succ
Assert.Contains(key, logMessage);
Assert.Contains(value, logMessage);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventData(item.First, item.Second, correlation));
}

Expand All @@ -143,7 +143,7 @@ public async Task SendMessagesWithoutOptions_WithMessageCorrelation_Succeeds()
// Assert
AssertDependencyTelemetry(logger);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventData(item.First, item.Second, correlation));
}

Expand All @@ -165,7 +165,7 @@ public async Task SendMessagesWithoutOptions_WithCustomDependencyId_Succeeds()
// Assert
AssertDependencyTelemetry(logger, dependencyId);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventDataWithDependencyId(item.First, item.Second, correlation, dependencyId));
}

Expand All @@ -187,7 +187,7 @@ public async Task SendMessagesWithoutOptions_WithCustomTransactionIdPropertyName
// Assert
AssertDependencyTelemetry(logger);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventData(item.First, item.Second, correlation, transactionIdPropertyName: transactionIdPropertyName));
}

Expand All @@ -209,7 +209,7 @@ public async Task SendMessagesWithoutOptions_WithCustomUpstreamServiceIdProperty
// Assert
AssertDependencyTelemetry(logger);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventData(item.First, item.Second, correlation, operationParentPropertyName: upstreamServicePropertyName));
}

Expand All @@ -234,7 +234,7 @@ public async Task SendMessagesWithoutOptions_WithCustomTelemetryContext_Succeeds
Assert.Contains(key, logMessage);
Assert.Contains(value, logMessage);
Assert.All(
spySender.Messages.Zip(expectedOrders),
spySender.Messages.Zip(expectedOrders),
item => AssertEnrichedEventData(item.First, item.Second, correlation));
}

Expand Down Expand Up @@ -291,15 +291,15 @@ private static void AssertEnrichedEventDataWithDependencyId(
Assert.Equal(correlation.TransactionId, Assert.Contains(transactionIdPropertyName, message.Properties));
Assert.Equal(dependencyId, Assert.Contains(operationParentIdPropertyName, message.Properties));
}

[Fact]
public async Task SendMessagesBodyWithoutOptions_WithoutMessageBody_Fails()
{
// Arrange
var sender = Mock.Of<EventHubProducerClient>();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(eventBatch: (IEnumerable<object>) null, correlation, logger));
Expand All @@ -312,7 +312,7 @@ public async Task SendMessageBodiesWithoutOptions_WithoutCorrelation_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var order = OrderGenerator.Generate();
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(new[] { order }, correlationInfo: null, logger));
Expand All @@ -325,7 +325,7 @@ public async Task SendMessageBodiesWithoutOptions_WithoutLogger_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var order = OrderGenerator.Generate();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(new[] { order }, correlation, logger: null));
Expand All @@ -338,7 +338,7 @@ public async Task SendMessageBodiesWithOptions_WithoutMessageBody_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(eventBatch: (IEnumerable<object>) null, correlation, logger, options => { }));
Expand All @@ -351,7 +351,7 @@ public async Task SendMessageBodiesWithOptions_WithoutCorrelation_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var order = OrderGenerator.Generate();
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(new[] { order }, correlationInfo: null, logger, options => { }));
Expand All @@ -364,7 +364,7 @@ public async Task SendMessageBodiesWithOptions_WithoutLogger_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var order = OrderGenerator.Generate();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(new[] { order }, correlation, logger: null, options => { }));
Expand All @@ -377,7 +377,7 @@ public async Task SendMessageWithoutOptions_WithoutMessageBody_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(eventBatch: null, correlation, logger));
Expand All @@ -390,7 +390,7 @@ public async Task SendMessageWithOptions_WithoutMessageBody_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(eventBatch: null, correlation, logger, options => { }));
Expand All @@ -403,7 +403,7 @@ public async Task SendMessagesWithoutOptions_WithoutMessageBody_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(eventBatch: null, correlation, logger));
Expand All @@ -416,7 +416,7 @@ public async Task SendMessagesWithoutOptions_WithoutCorrelation_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var order = ServiceBusMessageBuilder.CreateForBody(OrderGenerator.Generate()).Build();
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(new[] { order }, correlationInfo: null, logger));
Expand All @@ -429,7 +429,7 @@ public async Task SendMessagesWithoutOptions_WithoutLogger_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var order = ServiceBusMessageBuilder.CreateForBody(OrderGenerator.Generate()).Build();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(new[] { order }, correlation, logger: null));
Expand All @@ -442,7 +442,7 @@ public async Task SendMessagesWithOptions_WithoutMessageBody_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(eventBatch: null, correlation, logger, options => { }));
Expand All @@ -455,7 +455,7 @@ public async Task SendMessagesWithOptions_WithoutCorrelation_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var order = ServiceBusMessageBuilder.CreateForBody(OrderGenerator.Generate()).Build();
var logger = new InMemoryLogger();

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(new[] { order }, correlationInfo: null, logger, options => { }));
Expand All @@ -468,7 +468,7 @@ public async Task SendMessagesWithOptions_WithoutLogger_Fails()
var sender = Mock.Of<EventHubProducerClient>();
var order = ServiceBusMessageBuilder.CreateForBody(OrderGenerator.Generate()).Build();
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");

// Act
await Assert.ThrowsAnyAsync<ArgumentException>(
() => sender.SendAsync(new[] { order }, correlation, logger: null, options => { }));
Expand Down
16 changes: 8 additions & 8 deletions src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Arcus.Messaging.Abstractions;
using Arcus.Messaging.Abstractions.MessageHandling;
using Arcus.Messaging.Tests.Unit.Fixture;
using Arcus.Testing.Logging;
using Arcus.Testing;
using Bogus;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
Expand Down Expand Up @@ -310,7 +310,7 @@ public void CustomMessageHandlerFactory_WithContextFilter_SubtractsRegistration(
// Assert
MessageHandler messageHandler = Assert.Single(messageHandlers);
Assert.NotNull(messageHandler);

var context = TestMessageContext.Generate();
Assert.Equal(matchesContext, messageHandler.CanProcessMessageBasedOnContext(messageContext: context));
}
Expand All @@ -337,7 +337,7 @@ public void CustomMessageHandlerFactory_WithMessageBodyAndContextFilter_Subtract
// Assert
MessageHandler messageHandler = Assert.Single(messageHandlers);
Assert.NotNull(messageHandler);

var context = TestMessageContext.Generate();
Assert.Equal(matchesContext, messageHandler.CanProcessMessageBasedOnContext(messageContext: context));
Assert.Equal(matchesBody, messageHandler.CanProcessMessageBasedOnMessage(new TestMessage()));
Expand All @@ -354,7 +354,7 @@ public void SubtractsMessageHandlers_SelectsAllRegistrations()
collection.WithMessageHandler<StubTestMessageHandler<TestMessage, MessageContext>, TestMessage>();

IServiceProvider serviceProvider = collection.Services.BuildServiceProvider();

// Act
IEnumerable<MessageHandler> messageHandlers = MessageHandler.SubtractFrom(serviceProvider, _logger);

Expand Down Expand Up @@ -411,7 +411,7 @@ public async Task CustomMessageHandler_WithContextFilter_UsesMessageTypeDuringSe

var purchase = new Purchase
{
CustomerName = _bogusGenerator.Name.FullName(),
CustomerName = _bogusGenerator.Name.FullName(),
Price = _bogusGenerator.Commerce.Price()
};
string purchaseJson = JsonConvert.SerializeObject(purchase);
Expand All @@ -424,17 +424,17 @@ public async Task CustomMessageHandler_WithContextFilter_UsesMessageTypeDuringSe
// Assert
Assert.True(spyHandler.IsProcessed);
}

[Fact]
public void WithMultipleMessageHandlers_WithSameMessageType_RegistersBoth()
{
// Arrange
var services = new MessageHandlerCollection(new ServiceCollection());
services.WithMessageHandler<TestMessageHandler, TestMessage, TestMessageContext>(message => message.TestProperty == "Some value");

// Act
services.WithMessageHandler<TestMessageHandler, TestMessage, TestMessageContext>(message => message.TestProperty == "Some other value");

// Assert
IServiceProvider provider = services.Services.BuildServiceProvider();
IEnumerable<MessageHandler> handlers = MessageHandler.SubtractFrom(provider, NullLogger.Instance);
Expand Down
Loading
Loading