Skip to content

Commit 9a85e44

Browse files
stijnmoreelsstijnmoreels
authored
chore(deps): upgrade arcus.testing to v1.2 in unit tests (#473)
1 parent f38dc64 commit 9a85e44

File tree

7 files changed

+88
-88
lines changed

7 files changed

+88
-88
lines changed

‎src/Arcus.Messaging.Tests.Unit/Arcus.Messaging.Tests.Unit.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<PackageReference Include="Arcus.Security.Core" Version="2.0.0" />
1010
<PackageReference Include="Arcus.Testing.Security.Providers.InMemory" Version="0.5.0" />
11-
<PackageReference Include="Arcus.Testing.Logging" Version="0.5.0" />
11+
<PackageReference Include="Arcus.Testing.Logging.Xunit" Version="1.2.0" />
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
1313
<PackageReference Include="Moq" Version="4.13.1" />
1414
<PackageReference Include="Serilog" Version="2.10.0" />

‎src/Arcus.Messaging.Tests.Unit/EventHubs/EventHubProducerClientExtensionsTests.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Arcus.Messaging.Tests.Core.Generators;
88
using Arcus.Messaging.Tests.Core.Messages.v1;
99
using Arcus.Messaging.Tests.Unit.EventHubs.Fixture;
10-
using Arcus.Testing.Logging;
10+
using Arcus.Testing;
1111
using Azure.Messaging.EventHubs;
1212
using Azure.Messaging.EventHubs.Producer;
1313
using Azure.Messaging.ServiceBus;
@@ -34,12 +34,12 @@ public async Task SendMessagesBodyWithoutOptions_WithMessageCorrelation_Succeeds
3434
var logger = new InMemoryLogger();
3535

3636
// Act
37-
await spySender.SendAsync(expectedOrders, correlation, logger);
37+
await spySender.SendAsync(expectedOrders, correlation, logger);
3838

3939
// Assert
4040
AssertDependencyTelemetry(logger);
4141
Assert.All(
42-
spySender.Messages.Zip(expectedOrders),
42+
spySender.Messages.Zip(expectedOrders),
4343
item => AssertEnrichedEventData(item.First, item.Second, correlation));
4444
}
4545

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

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

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

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

@@ -143,7 +143,7 @@ public async Task SendMessagesWithoutOptions_WithMessageCorrelation_Succeeds()
143143
// Assert
144144
AssertDependencyTelemetry(logger);
145145
Assert.All(
146-
spySender.Messages.Zip(expectedOrders),
146+
spySender.Messages.Zip(expectedOrders),
147147
item => AssertEnrichedEventData(item.First, item.Second, correlation));
148148
}
149149

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

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

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

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

@@ -291,15 +291,15 @@ private static void AssertEnrichedEventDataWithDependencyId(
291291
Assert.Equal(correlation.TransactionId, Assert.Contains(transactionIdPropertyName, message.Properties));
292292
Assert.Equal(dependencyId, Assert.Contains(operationParentIdPropertyName, message.Properties));
293293
}
294-
294+
295295
[Fact]
296296
public async Task SendMessagesBodyWithoutOptions_WithoutMessageBody_Fails()
297297
{
298298
// Arrange
299299
var sender = Mock.Of<EventHubProducerClient>();
300300
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
301301
var logger = new InMemoryLogger();
302-
302+
303303
// Act
304304
await Assert.ThrowsAnyAsync<ArgumentException>(
305305
() => sender.SendAsync(eventBatch: (IEnumerable<object>) null, correlation, logger));
@@ -312,7 +312,7 @@ public async Task SendMessageBodiesWithoutOptions_WithoutCorrelation_Fails()
312312
var sender = Mock.Of<EventHubProducerClient>();
313313
var order = OrderGenerator.Generate();
314314
var logger = new InMemoryLogger();
315-
315+
316316
// Act
317317
await Assert.ThrowsAnyAsync<ArgumentException>(
318318
() => sender.SendAsync(new[] { order }, correlationInfo: null, logger));
@@ -325,7 +325,7 @@ public async Task SendMessageBodiesWithoutOptions_WithoutLogger_Fails()
325325
var sender = Mock.Of<EventHubProducerClient>();
326326
var order = OrderGenerator.Generate();
327327
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
328-
328+
329329
// Act
330330
await Assert.ThrowsAnyAsync<ArgumentException>(
331331
() => sender.SendAsync(new[] { order }, correlation, logger: null));
@@ -338,7 +338,7 @@ public async Task SendMessageBodiesWithOptions_WithoutMessageBody_Fails()
338338
var sender = Mock.Of<EventHubProducerClient>();
339339
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
340340
var logger = new InMemoryLogger();
341-
341+
342342
// Act
343343
await Assert.ThrowsAnyAsync<ArgumentException>(
344344
() => sender.SendAsync(eventBatch: (IEnumerable<object>) null, correlation, logger, options => { }));
@@ -351,7 +351,7 @@ public async Task SendMessageBodiesWithOptions_WithoutCorrelation_Fails()
351351
var sender = Mock.Of<EventHubProducerClient>();
352352
var order = OrderGenerator.Generate();
353353
var logger = new InMemoryLogger();
354-
354+
355355
// Act
356356
await Assert.ThrowsAnyAsync<ArgumentException>(
357357
() => sender.SendAsync(new[] { order }, correlationInfo: null, logger, options => { }));
@@ -364,7 +364,7 @@ public async Task SendMessageBodiesWithOptions_WithoutLogger_Fails()
364364
var sender = Mock.Of<EventHubProducerClient>();
365365
var order = OrderGenerator.Generate();
366366
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
367-
367+
368368
// Act
369369
await Assert.ThrowsAnyAsync<ArgumentException>(
370370
() => sender.SendAsync(new[] { order }, correlation, logger: null, options => { }));
@@ -377,7 +377,7 @@ public async Task SendMessageWithoutOptions_WithoutMessageBody_Fails()
377377
var sender = Mock.Of<EventHubProducerClient>();
378378
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
379379
var logger = new InMemoryLogger();
380-
380+
381381
// Act
382382
await Assert.ThrowsAnyAsync<ArgumentException>(
383383
() => sender.SendAsync(eventBatch: null, correlation, logger));
@@ -390,7 +390,7 @@ public async Task SendMessageWithOptions_WithoutMessageBody_Fails()
390390
var sender = Mock.Of<EventHubProducerClient>();
391391
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
392392
var logger = new InMemoryLogger();
393-
393+
394394
// Act
395395
await Assert.ThrowsAnyAsync<ArgumentException>(
396396
() => sender.SendAsync(eventBatch: null, correlation, logger, options => { }));
@@ -403,7 +403,7 @@ public async Task SendMessagesWithoutOptions_WithoutMessageBody_Fails()
403403
var sender = Mock.Of<EventHubProducerClient>();
404404
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
405405
var logger = new InMemoryLogger();
406-
406+
407407
// Act
408408
await Assert.ThrowsAnyAsync<ArgumentException>(
409409
() => sender.SendAsync(eventBatch: null, correlation, logger));
@@ -416,7 +416,7 @@ public async Task SendMessagesWithoutOptions_WithoutCorrelation_Fails()
416416
var sender = Mock.Of<EventHubProducerClient>();
417417
var order = ServiceBusMessageBuilder.CreateForBody(OrderGenerator.Generate()).Build();
418418
var logger = new InMemoryLogger();
419-
419+
420420
// Act
421421
await Assert.ThrowsAnyAsync<ArgumentException>(
422422
() => sender.SendAsync(new[] { order }, correlationInfo: null, logger));
@@ -429,7 +429,7 @@ public async Task SendMessagesWithoutOptions_WithoutLogger_Fails()
429429
var sender = Mock.Of<EventHubProducerClient>();
430430
var order = ServiceBusMessageBuilder.CreateForBody(OrderGenerator.Generate()).Build();
431431
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
432-
432+
433433
// Act
434434
await Assert.ThrowsAnyAsync<ArgumentException>(
435435
() => sender.SendAsync(new[] { order }, correlation, logger: null));
@@ -442,7 +442,7 @@ public async Task SendMessagesWithOptions_WithoutMessageBody_Fails()
442442
var sender = Mock.Of<EventHubProducerClient>();
443443
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
444444
var logger = new InMemoryLogger();
445-
445+
446446
// Act
447447
await Assert.ThrowsAnyAsync<ArgumentException>(
448448
() => sender.SendAsync(eventBatch: null, correlation, logger, options => { }));
@@ -455,7 +455,7 @@ public async Task SendMessagesWithOptions_WithoutCorrelation_Fails()
455455
var sender = Mock.Of<EventHubProducerClient>();
456456
var order = ServiceBusMessageBuilder.CreateForBody(OrderGenerator.Generate()).Build();
457457
var logger = new InMemoryLogger();
458-
458+
459459
// Act
460460
await Assert.ThrowsAnyAsync<ArgumentException>(
461461
() => sender.SendAsync(new[] { order }, correlationInfo: null, logger, options => { }));
@@ -468,7 +468,7 @@ public async Task SendMessagesWithOptions_WithoutLogger_Fails()
468468
var sender = Mock.Of<EventHubProducerClient>();
469469
var order = ServiceBusMessageBuilder.CreateForBody(OrderGenerator.Generate()).Build();
470470
var correlation = new MessageCorrelationInfo("operation ID", "transaction ID", "parent ID");
471-
471+
472472
// Act
473473
await Assert.ThrowsAnyAsync<ArgumentException>(
474474
() => sender.SendAsync(new[] { order }, correlation, logger: null, options => { }));

‎src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Arcus.Messaging.Abstractions;
77
using Arcus.Messaging.Abstractions.MessageHandling;
88
using Arcus.Messaging.Tests.Unit.Fixture;
9-
using Arcus.Testing.Logging;
9+
using Arcus.Testing;
1010
using Bogus;
1111
using Microsoft.Extensions.DependencyInjection;
1212
using Microsoft.Extensions.Logging;
@@ -310,7 +310,7 @@ public void CustomMessageHandlerFactory_WithContextFilter_SubtractsRegistration(
310310
// Assert
311311
MessageHandler messageHandler = Assert.Single(messageHandlers);
312312
Assert.NotNull(messageHandler);
313-
313+
314314
var context = TestMessageContext.Generate();
315315
Assert.Equal(matchesContext, messageHandler.CanProcessMessageBasedOnContext(messageContext: context));
316316
}
@@ -337,7 +337,7 @@ public void CustomMessageHandlerFactory_WithMessageBodyAndContextFilter_Subtract
337337
// Assert
338338
MessageHandler messageHandler = Assert.Single(messageHandlers);
339339
Assert.NotNull(messageHandler);
340-
340+
341341
var context = TestMessageContext.Generate();
342342
Assert.Equal(matchesContext, messageHandler.CanProcessMessageBasedOnContext(messageContext: context));
343343
Assert.Equal(matchesBody, messageHandler.CanProcessMessageBasedOnMessage(new TestMessage()));
@@ -354,7 +354,7 @@ public void SubtractsMessageHandlers_SelectsAllRegistrations()
354354
collection.WithMessageHandler<StubTestMessageHandler<TestMessage, MessageContext>, TestMessage>();
355355

356356
IServiceProvider serviceProvider = collection.Services.BuildServiceProvider();
357-
357+
358358
// Act
359359
IEnumerable<MessageHandler> messageHandlers = MessageHandler.SubtractFrom(serviceProvider, _logger);
360360

@@ -411,7 +411,7 @@ public async Task CustomMessageHandler_WithContextFilter_UsesMessageTypeDuringSe
411411

412412
var purchase = new Purchase
413413
{
414-
CustomerName = _bogusGenerator.Name.FullName(),
414+
CustomerName = _bogusGenerator.Name.FullName(),
415415
Price = _bogusGenerator.Commerce.Price()
416416
};
417417
string purchaseJson = JsonConvert.SerializeObject(purchase);
@@ -424,17 +424,17 @@ public async Task CustomMessageHandler_WithContextFilter_UsesMessageTypeDuringSe
424424
// Assert
425425
Assert.True(spyHandler.IsProcessed);
426426
}
427-
427+
428428
[Fact]
429429
public void WithMultipleMessageHandlers_WithSameMessageType_RegistersBoth()
430430
{
431431
// Arrange
432432
var services = new MessageHandlerCollection(new ServiceCollection());
433433
services.WithMessageHandler<TestMessageHandler, TestMessage, TestMessageContext>(message => message.TestProperty == "Some value");
434-
434+
435435
// Act
436436
services.WithMessageHandler<TestMessageHandler, TestMessage, TestMessageContext>(message => message.TestProperty == "Some other value");
437-
437+
438438
// Assert
439439
IServiceProvider provider = services.Services.BuildServiceProvider();
440440
IEnumerable<MessageHandler> handlers = MessageHandler.SubtractFrom(provider, NullLogger.Instance);

0 commit comments

Comments
 (0)