@@ -15,6 +15,7 @@ namespace KafkaFlow.Retry.IntegrationTests
1515 [ Collection ( "BootstrapperHostCollection" ) ]
1616 public class EmptyPartitionKeyRetryDurableTests
1717 {
18+ private const int defaultWaitingTimeSeconds = 120 ;
1819 private readonly IRepositoryProvider repositoryProvider ;
1920 private readonly IServiceProvider serviceProvider ;
2021
@@ -33,31 +34,27 @@ public static IEnumerable<object[]> EmptyKeyScenarios()
3334 RepositoryType . MongoDb ,
3435 typeof ( IMessageProducer < RetryDurableGuaranteeOrderedConsumptionMongoDbProducer > ) ,
3536 typeof ( RetryDurableGuaranteeOrderedConsumptionPhysicalStorageAssert ) ,
36- 2 , //numberOfMessagesToBeProduced
37- 1 //numberOfMessagesByEachSameKey
37+ 3 //numberOfMessagesToBeProduced
3838 } ;
3939 yield return new object [ ]
4040 {
4141 RepositoryType . SqlServer ,
4242 typeof ( IMessageProducer < RetryDurableGuaranteeOrderedConsumptionSqlServerProducer > ) ,
4343 typeof ( RetryDurableGuaranteeOrderedConsumptionPhysicalStorageAssert ) ,
44- 2 ,
45- 1
44+ 3
4645 } ;
4746 yield return new object [ ]
4847 {
4948 RepositoryType . MongoDb ,
5049 typeof ( IMessageProducer < RetryDurableLatestConsumptionMongoDbProducer > ) ,
5150 typeof ( RetryDurableLatestConsumptionPhysicalStorageAssert ) ,
52- 2 ,
5351 1
5452 } ;
5553 yield return new object [ ]
5654 {
5755 RepositoryType . SqlServer ,
5856 typeof ( IMessageProducer < RetryDurableLatestConsumptionSqlServerProducer > ) ,
5957 typeof ( RetryDurableLatestConsumptionPhysicalStorageAssert ) ,
60- 2 ,
6158 1
6259 } ;
6360 }
@@ -68,12 +65,11 @@ internal async Task EmptyKeyRetryDurableTest(
6865 RepositoryType repositoryType ,
6966 Type producerType ,
7067 Type physicalStorageType ,
71- int numberOfMessagesToBeProduced ,
72- int numberOfMessagesByEachSameKey )
68+ int numberOfMessagesToBeProduced )
7369 {
7470 // Arrange
71+ var numberOfMessagesByEachSameKey = 1 ;
7572 var numberOfTimesThatEachMessageIsTriedWhenDone = 1 ;
76- var numberOfTimesThatEachMessageIsTriedBeforeDurable = 4 ;
7773 var numberOfTimesThatEachMessageIsTriedDuringDurable = 1 ;
7874 var producer = this . serviceProvider . GetRequiredService ( producerType ) as IMessageProducer ;
7975 var physicalStorageAssert = this . serviceProvider . GetRequiredService ( physicalStorageType ) as IPhysicalStorageAssert ;
@@ -91,27 +87,7 @@ internal async Task EmptyKeyRetryDurableTest(
9187 await producer . ProduceAsync ( message . Key , message ) . ConfigureAwait ( false ) ;
9288 }
9389
94- RetryDurableTestMessage messageToValidate ;
95- if ( producer is IMessageProducer < RetryDurableLatestConsumptionSqlServerProducer > || producer is IMessageProducer < RetryDurableLatestConsumptionMongoDbProducer > )
96- {
97- messageToValidate = messages [ numberOfMessagesToBeProduced - 1 ] ;
98-
99- // Assert - Creation
100- foreach ( var message in messages )
101- {
102- await InMemoryAuxiliarStorage < RetryDurableTestMessage >
103- . AssertEmptyPartitionKeyCountMessageAsync ( message , numberOfTimesThatEachMessageIsTriedBeforeDurable , 120 )
104- . ConfigureAwait ( false ) ;
105- }
106- }
107- else
108- {
109- messageToValidate = messages [ 0 ] ;
110-
111- await InMemoryAuxiliarStorage < RetryDurableTestMessage >
112- . AssertEmptyPartitionKeyCountMessageAsync ( messageToValidate , numberOfTimesThatEachMessageIsTriedBeforeDurable , 120 )
113- . ConfigureAwait ( false ) ;
114- }
90+ RetryDurableTestMessage messageToValidate = messages [ 0 ] ;
11591
11692 await physicalStorageAssert
11793 . AssertEmptyKeyRetryDurableMessageRetryingAsync ( repositoryType , messageToValidate , numberOfMessagesByEachSameKey )
@@ -121,7 +97,7 @@ await physicalStorageAssert
12197 InMemoryAuxiliarStorage < RetryDurableTestMessage > . Clear ( ) ;
12298
12399 await InMemoryAuxiliarStorage < RetryDurableTestMessage >
124- . AssertEmptyPartitionKeyCountMessageAsync ( messageToValidate , numberOfTimesThatEachMessageIsTriedDuringDurable , 120 )
100+ . AssertEmptyPartitionKeyCountMessageAsync ( messageToValidate , numberOfTimesThatEachMessageIsTriedDuringDurable , defaultWaitingTimeSeconds )
125101 . ConfigureAwait ( false ) ;
126102
127103 await physicalStorageAssert
@@ -133,7 +109,7 @@ await physicalStorageAssert
133109 InMemoryAuxiliarStorage < RetryDurableTestMessage > . Clear ( ) ;
134110
135111 await InMemoryAuxiliarStorage < RetryDurableTestMessage >
136- . AssertEmptyPartitionKeyCountMessageAsync ( messageToValidate , numberOfTimesThatEachMessageIsTriedWhenDone , 120 )
112+ . AssertEmptyPartitionKeyCountMessageAsync ( messageToValidate , numberOfTimesThatEachMessageIsTriedWhenDone , defaultWaitingTimeSeconds )
137113 . ConfigureAwait ( false ) ;
138114
139115 await physicalStorageAssert
0 commit comments