Skip to content

Commit c2d7511

Browse files
committed
corrected broken tests after bad conflict resolution from merging main into feature branch
1 parent ef48033 commit c2d7511

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

projects/Test/SequentialIntegration/TestActivitySource.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,14 @@ public async Task TestPublisherWithPublicationAddressAndConsumerActivityTagsAsyn
307307
}
308308

309309
[Theory]
310-
[InlineData(true, true)]
311-
[InlineData(true, false)]
312-
[InlineData(false, true)]
313-
[InlineData(false, false)]
310+
[InlineData(true, true, true)]
311+
[InlineData(true, true, false)]
312+
[InlineData(true, false, true)]
313+
[InlineData(true, false, false)]
314+
[InlineData(false, true, true)]
315+
[InlineData(false, true, false)]
316+
[InlineData(false, false, true)]
317+
[InlineData(false, false, false)]
314318
public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOperationName, bool usePublisherAsParent, bool useMessageId)
315319
{
316320
RabbitMQActivitySource.UseRoutingKeyAsOperationName = useRoutingKeyAsOperationName;

projects/Test/SequentialIntegration/TestOpenTelemetry.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,15 @@ public async Task TestPublisherWithCachedStringsAndConsumerActivityTagsAsync(boo
333333
}
334334

335335
[Theory]
336-
[InlineData(true, true)]
337-
[InlineData(true, false)]
338-
[InlineData(false, true)]
339-
[InlineData(false, false)]
340-
public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOperationName, bool usePublisherAsParent, basicProps.MessageId)
336+
[InlineData(true, true, true)]
337+
[InlineData(true, true, false)]
338+
[InlineData(true, false, true)]
339+
[InlineData(true, false, false)]
340+
[InlineData(false, true, true)]
341+
[InlineData(false, true, false)]
342+
[InlineData(false, false, true)]
343+
[InlineData(false, false, false)]
344+
public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOperationName, bool usePublisherAsParent, bool useMessageId)
341345
{
342346
var exportedItems = new List<Activity>();
343347
using var tracer = Sdk.CreateTracerProviderBuilder()

0 commit comments

Comments
 (0)