Skip to content

Commit 0525ef7

Browse files
chore:resolve codacy warnings
1 parent 06316c7 commit 0525ef7

File tree

3 files changed

+27
-55
lines changed

3 files changed

+27
-55
lines changed

src/KafkaFlow.Retry.IntegrationTests/Core/Storages/InMemoryAuxiliarStorage.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ public static async Task AssertEmptyPartitionKeyCountMessageAsync(T message, int
5252

5353
await Task.Delay(1000).ConfigureAwait(false);
5454
} while (numberOfMessages != count);
55-
56-
Console.WriteLine($"Message {message.Key}:{message.Value} received {count} times");
5755
}
5856

5957
public static void Clear()

src/KafkaFlow.Retry.IntegrationTests/EmptyPartitionKeyRetryDurableTests.cs

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -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

src/KafkaFlow.Retry.UnitTests/Durable/Repository/RetryDurableQueueRepositoryTests.cs

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
namespace KafkaFlow.Retry.UnitTests.Durable.Repository
22
{
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Linq;
6+
using System.Text;
7+
using System.Threading.Tasks;
38
using global::KafkaFlow.Retry.Durable.Definitions;
49
using global::KafkaFlow.Retry.Durable.Encoders;
510
using global::KafkaFlow.Retry.Durable.Repository;
@@ -8,42 +13,35 @@
813
using global::KafkaFlow.Retry.Durable.Repository.Adapters;
914
using global::KafkaFlow.Retry.Durable.Repository.Model;
1015
using Moq;
11-
using System;
12-
using System.Collections.Generic;
13-
using System.Linq;
14-
using System.Text;
15-
using System.Threading.Tasks;
1616
using Xunit;
1717

1818
public class RetryDurableQueueRepositoryTests
1919
{
20-
private readonly Mock<IUpdateRetryQueueItemHandler> mockIUpdateRetryQueueItemHandler;
2120
private readonly Mock<IMessageAdapter> mockMessageAdapter;
2221
private readonly Mock<IMessageHeadersAdapter> mockMessageHeadersAdapter;
2322
private readonly MockRepository mockRepository;
2423
private readonly Mock<IRetryDurableQueueRepositoryProvider> mockRetryDurableQueueRepositoryProvider;
2524
private readonly Mock<IUtf8Encoder> mockUtf8Encoder;
26-
private readonly RetryDurablePollingDefinition retryDurablePollingDefinition;
2725
private readonly RetryDurableQueueRepository retryDurableQueueRepository;
2826

2927
public RetryDurableQueueRepositoryTests()
3028
{
31-
this.mockRepository = new MockRepository(MockBehavior.Strict);
29+
mockRepository = new MockRepository(MockBehavior.Strict);
3230

33-
this.mockRetryDurableQueueRepositoryProvider = this.mockRepository.Create<IRetryDurableQueueRepositoryProvider>();
34-
this.mockIUpdateRetryQueueItemHandler = this.mockRepository.Create<IUpdateRetryQueueItemHandler>();
35-
this.mockMessageHeadersAdapter = this.mockRepository.Create<IMessageHeadersAdapter>();
36-
this.mockMessageAdapter = this.mockRepository.Create<IMessageAdapter>();
37-
this.mockUtf8Encoder = this.mockRepository.Create<IUtf8Encoder>();
38-
this.retryDurablePollingDefinition = new RetryDurablePollingDefinition(true, "0 0 0 ? * * *", 1, 1, "some_id");
31+
mockRetryDurableQueueRepositoryProvider = mockRepository.Create<IRetryDurableQueueRepositoryProvider>();
32+
var mockIUpdateRetryQueueItemHandler = mockRepository.Create<IUpdateRetryQueueItemHandler>();
33+
mockMessageHeadersAdapter = mockRepository.Create<IMessageHeadersAdapter>();
34+
mockMessageAdapter = mockRepository.Create<IMessageAdapter>();
35+
mockUtf8Encoder = mockRepository.Create<IUtf8Encoder>();
36+
var retryDurablePollingDefinition = new RetryDurablePollingDefinition(true, "0 0 0 ? * * *", 1, 1, "some_id");
3937

4038
retryDurableQueueRepository = new RetryDurableQueueRepository(
41-
this.mockRetryDurableQueueRepositoryProvider.Object,
42-
new List<IUpdateRetryQueueItemHandler> { this.mockIUpdateRetryQueueItemHandler.Object },
43-
this.mockMessageHeadersAdapter.Object,
44-
this.mockMessageAdapter.Object,
45-
this.mockUtf8Encoder.Object,
46-
this.retryDurablePollingDefinition);
39+
mockRetryDurableQueueRepositoryProvider.Object,
40+
new List<IUpdateRetryQueueItemHandler> { mockIUpdateRetryQueueItemHandler.Object },
41+
mockMessageHeadersAdapter.Object,
42+
mockMessageAdapter.Object,
43+
mockUtf8Encoder.Object,
44+
retryDurablePollingDefinition);
4745
}
4846

4947
[Theory]
@@ -112,7 +110,7 @@ public async Task AddIfQueueExistsAsync_WithValidMessage_ReturnResultStatusAdded
112110
// Assert
113111
Assert.NotNull(result);
114112
Assert.Equal(addedIfQueueExistsResultStatus, result.Status);
115-
this.mockRepository.VerifyAll();
113+
mockRepository.VerifyAll();
116114
}
117115
}
118116
}

0 commit comments

Comments
 (0)