Skip to content

Commit

Permalink
fix: Azure Function Tests (#490)
Browse files Browse the repository at this point in the history
* fix: Add parameterless constructor again to fix tests

* chore: code cleanup recommendations

* fix: Remove this.getservice as causing errors
  • Loading branch information
jimwashbrook committed Jan 26, 2024
1 parent 068a23d commit ef6de0a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
9 changes: 6 additions & 3 deletions src/Dfe.PlanTech.Infrastructure.Data/CmsDbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ public class CmsDbContext : DbContext, ICmsDbContext

private readonly ContentfulOptions _contentfulOptions;

public CmsDbContext()
{
_contentfulOptions = new ContentfulOptions(false);
}

public CmsDbContext(DbContextOptions<CmsDbContext> options) : base(options)
{
_contentfulOptions = this.GetService<ContentfulOptions>();
Expand Down Expand Up @@ -201,9 +206,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
/// Should the given entity be displayed? I.e. is it not archived, not deleted, and either published or use preview mode is enabled
/// </summary>
private Expression<Func<ContentComponentDbEntity, bool>> ShouldShowEntity()
{
return entity => (_contentfulOptions.UsePreview || entity.Published) && !entity.Archived && !entity.Deleted;
}
=> entity => (_contentfulOptions.UsePreview || entity.Published) && !entity.Archived && !entity.Deleted;

public Task<PageDbEntity?> GetPageBySlug(string slug, CancellationToken cancellationToken = default)
=> Pages.Include(page => page.BeforeTitleContent)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public async Task QueueReceiverDbWriter_Should_Execute_Successfully()

ServiceBusReceivedMessage serviceBusReceivedMessage = ServiceBusReceivedMessage.FromAmqpMessage(serviceBusMessage.GetRawAmqpMessage(), BinaryData.FromBytes(Encoding.UTF8.GetBytes(serviceBusReceivedMessageMock.LockToken)));

await _queueReceiver.QueueReceiverDbWriter(new ServiceBusReceivedMessage[] { serviceBusReceivedMessage }, serviceBusMessageActionsMock, CancellationToken.None);
await _queueReceiver.QueueReceiverDbWriter([serviceBusReceivedMessage], serviceBusMessageActionsMock, CancellationToken.None);

await serviceBusMessageActionsMock.Received().CompleteMessageAsync(Arg.Any<ServiceBusReceivedMessage>());
await _cmsDbContextMock.ReceivedWithAnyArgs(1).SaveChangesAsync(Arg.Any<CancellationToken>());
Expand Down Expand Up @@ -148,7 +148,7 @@ public async Task QueueReceiverDbWriter_Should_MapExistingDbEntity_To_Message()

ServiceBusReceivedMessage serviceBusReceivedMessage = ServiceBusReceivedMessage.FromAmqpMessage(serviceBusMessage.GetRawAmqpMessage(), BinaryData.FromBytes(Encoding.UTF8.GetBytes(serviceBusReceivedMessageMock.LockToken)));

await _queueReceiver.QueueReceiverDbWriter(new ServiceBusReceivedMessage[] { serviceBusReceivedMessage }, serviceBusMessageActionsMock, CancellationToken.None);
await _queueReceiver.QueueReceiverDbWriter([serviceBusReceivedMessage], serviceBusMessageActionsMock, CancellationToken.None);

await serviceBusMessageActionsMock.Received().CompleteMessageAsync(Arg.Any<ServiceBusReceivedMessage>(), Arg.Any<CancellationToken>());
_cmsDbContextMock.ReceivedWithAnyArgs(0).Add(Arg.Any<ContentComponentDbEntity>());
Expand Down Expand Up @@ -254,7 +254,7 @@ public async Task QueueRecieverDbWriter_Should_CompleteSuccessfully_After_Existi

ServiceBusReceivedMessage serviceBusReceivedMessage = ServiceBusReceivedMessage.FromAmqpMessage(serviceBusMessage.GetRawAmqpMessage(), BinaryData.FromBytes(Encoding.UTF8.GetBytes(serviceBusReceivedMessageMock.LockToken)));

await _queueReceiver.QueueReceiverDbWriter(new ServiceBusReceivedMessage[] { serviceBusReceivedMessage }, serviceBusMessageActionsMock, CancellationToken.None);
await _queueReceiver.QueueReceiverDbWriter([serviceBusReceivedMessage], serviceBusMessageActionsMock, CancellationToken.None);

await serviceBusMessageActionsMock.Received().CompleteMessageAsync(Arg.Any<ServiceBusReceivedMessage>(), Arg.Any<CancellationToken>());
_cmsDbContextMock.ReceivedWithAnyArgs(0).Add(Arg.Any<ContentComponentDbEntity>());
Expand Down

0 comments on commit ef6de0a

Please sign in to comment.