Skip to content

Commit 030b6c2

Browse files
committed
move test-only implementation into the test context
1 parent 6490609 commit 030b6c2

10 files changed

Lines changed: 5 additions & 25 deletions

File tree

‎src/ServiceControl.Persistence.EFCore/Implementation/ErrorMessagesDataStore.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,4 @@ public Task<byte[]> FetchFromFailedMessage(string uniqueMessageId) =>
113113

114114
public Task StoreEventLogItem(EventLogItem logItem) =>
115115
throw new NotImplementedException();
116-
117-
public Task StoreFailedMessagesForTestsOnly(params FailedMessage[] failedMessages)
118-
=> throw new NotImplementedException("EF Tests Use the Ingestion pathway to populate this data");
119116
}

‎src/ServiceControl.Persistence.RavenDB/ErrorMessagesDataStore.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -663,16 +663,5 @@ public async Task StoreEventLogItem(EventLogItem logItem)
663663

664664
await session.SaveChangesAsync();
665665
}
666-
667-
public async Task StoreFailedMessagesForTestsOnly(params FailedMessage[] failedMessages)
668-
{
669-
using var session = await sessionProvider.OpenSession();
670-
foreach (var message in failedMessages)
671-
{
672-
await session.StoreAsync(message);
673-
}
674-
675-
await session.SaveChangesAsync();
676-
}
677666
}
678667
}

‎src/ServiceControl.Persistence.Tests/Recoverability/EditHandlerAuditTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ async Task<FailedMessage> CreateAndStoreFailedMessage(string failedMessageId = n
105105
}
106106
]
107107
};
108-
await ErrorMessageDataStore.StoreFailedMessagesForTestsOnly(new[] { failedMessage });
108+
await PersistenceTestsContext.InsertFailedMessages(failedMessage);
109109
return failedMessage;
110110
}
111111
}

‎src/ServiceControl.Persistence.Tests/Recoverability/EditMessageTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ async Task<FailedMessage> CreateAndStoreFailedMessage(string failedMessageId = n
262262
}
263263
]
264264
};
265-
await ErrorMessageDataStore.StoreFailedMessagesForTestsOnly(new[] { failedMessage });
265+
await PersistenceTestsContext.InsertFailedMessages(failedMessage);
266266
return failedMessage;
267267
}
268268
}

‎src/ServiceControl.Persistence.Tests/Recoverability/RetryConfirmationProcessorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public async Task Setup()
2525

2626
Handler = new LegacyMessageFailureResolvedHandler(ErrorMessageDataStore, domainEvents);
2727

28-
await ErrorMessageDataStore.StoreFailedMessagesForTestsOnly(
28+
await PersistenceTestsContext.InsertFailedMessages(
2929
new FailedMessage
3030
{
3131
Id = MessageId,

‎src/ServiceControl.Persistence.Tests/Recoverability/ReturnToSenderDequeuerTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ public Task<QueryResult<IList<FailedMessageView>>> ErrorsByEndpointName(string s
243243

244244
public Task<byte[]> FetchFromFailedMessage(string bodyId) => Task.FromResult(Encoding.UTF8.GetBytes(bodyId));
245245
public Task StoreEventLogItem(EventLogItem logItem) => throw new NotImplementedException();
246-
247-
public Task StoreFailedMessagesForTestsOnly(params FailedMessage[] failedMessages) => throw new NotImplementedException();
248246
}
249247
}
250248
}

‎src/ServiceControl.Persistence.Tests/RetryStateTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public async Task When_a_selection_is_staged_each_message_is_audited_as_a_batch(
254254
]
255255
}).ToArray();
256256

257-
await ErrorStore.StoreFailedMessagesForTestsOnly(messages);
257+
await PersistenceTestsContext.InsertFailedMessages(messages);
258258
await CompleteDatabaseOperation();
259259

260260
var gateway = new CustomRetriesGateway(true, RetryStore, retryManager);
@@ -342,7 +342,7 @@ async Task CreateAFailedMessageAndMarkAsPartOfRetryBatch(RetryingManager retryMa
342342
]
343343
}).ToArray();
344344

345-
await ErrorStore.StoreFailedMessagesForTestsOnly(messages);
345+
await PersistenceTestsContext.InsertFailedMessages(messages);
346346

347347
// Needs index FailedMessages_ByGroup
348348
// Needs index FailedMessages_UniqueMessageIdAndTimeOfFailures

‎src/ServiceControl.Persistence/IErrorMessageDatastore.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,5 @@ public interface IErrorMessageDataStore
7171

7272
// AuditEventLogWriter
7373
Task StoreEventLogItem(EventLogItem logItem);
74-
75-
Task StoreFailedMessagesForTestsOnly(params FailedMessage[] failedMessages);
7674
}
7775
}

‎src/ServiceControl.UnitTests/MessageFailures/AsyncRangeAndQueueAuditTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,5 @@ internal sealed class StubErrorMessageDataStore : IErrorMessageDataStore
192192
public Task RevertRetry(string messageUniqueId) => throw new NotImplementedException();
193193
public Task<byte[]> FetchFromFailedMessage(string uniqueMessageId) => throw new NotImplementedException();
194194
public Task StoreEventLogItem(EventLogItem logItem) => throw new NotImplementedException();
195-
public Task StoreFailedMessagesForTestsOnly(params FailedMessage[] failedMessages) => throw new NotImplementedException();
196195
}
197196
}

‎src/ServiceControl.UnitTests/MessageFailures/EditFailedMessagesControllerAuditTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,5 @@ sealed class StubErrorMessageDataStore : IErrorMessageDataStore
9797
public Task<string[]> GetRetryPendingMessages(DateTime from, DateTime to, string queueAddress) => throw new NotImplementedException();
9898
public Task<byte[]> FetchFromFailedMessage(string uniqueMessageId) => throw new NotImplementedException();
9999
public Task StoreEventLogItem(EventLogItem logItem) => throw new NotImplementedException();
100-
public Task StoreFailedMessagesForTestsOnly(params FailedMessage[] failedMessages) => throw new NotImplementedException();
101100
}
102101
}

0 commit comments

Comments
 (0)