Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix JetBrains warnings and update ReSharper version to 2024.3.4 #679

Merged
merged 1 commit into from
Jan 25, 2025
Merged

Fix JetBrains warnings and update ReSharper version to 2024.3.4 #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion application/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"commands": ["dotnet-dotcover"]
},
"jetbrains.resharper.globaltools": {
"version": "2024.3.0",
"version": "2024.3.4",
"commands": ["jb"]
}
}
Expand Down
5 changes: 2 additions & 3 deletions application/shared-kernel/Tests/Behaviors/PublishDomainEventsPipelineBehaviorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public async Task Handle_WhenCalled_ShouldPublishDomainEvents()
publisher
);
var request = new TestCommand();
var cancellationToken = new CancellationToken();
var next = Substitute.For<RequestHandlerDelegate<Result<TestAggregate>>>();
next.Invoke().Returns(TestAggregate.Create("Test"));

Expand All @@ -32,10 +31,10 @@ public async Task Handle_WhenCalled_ShouldPublishDomainEvents()
);

// Act
await behavior.Handle(request, next, cancellationToken);
await behavior.Handle(request, next, CancellationToken.None);

// Assert
await publisher.Received(1).Publish(domainEvent, cancellationToken);
await publisher.Received(1).Publish(domainEvent, CancellationToken.None);
testAggregate.DomainEvents.Should().BeEmpty();
}
}
12 changes: 5 additions & 7 deletions application/shared-kernel/Tests/Behaviors/UnitOfWorkPipelineBehaviorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,19 @@ public async Task Handle_WhenSuccessfulCommand_ShouldCallNextAndCommitChanges()
{
// Arrange
var command = new TestCommand();
var cancellationToken = new CancellationToken();
var next = Substitute.For<RequestHandlerDelegate<Result<TestAggregate>>>();
var successfulCommandResult = Result<TestAggregate>.Success(TestAggregate.Create("Foo"));
next.Invoke().Returns(Task.FromResult(successfulCommandResult));

// Act
_ = await _behavior.Handle(command, next, cancellationToken);
_ = await _behavior.Handle(command, next, CancellationToken.None);

// Assert
await _unitOfWork.Received().CommitAsync(cancellationToken);
await _unitOfWork.Received().CommitAsync(CancellationToken.None);
Received.InOrder(() =>
{
next.Invoke();
_unitOfWork.CommitAsync(cancellationToken);
_unitOfWork.CommitAsync(CancellationToken.None);
}
);
}
Expand All @@ -52,16 +51,15 @@ public async Task Handle_WhenNonSuccessfulCommand_ShouldCallNextButNotCommitChan
{
// Arrange
var command = new TestCommand();
var cancellationToken = new CancellationToken();
var next = Substitute.For<RequestHandlerDelegate<Result<TestAggregate>>>();
var successfulCommandResult = Result<TestAggregate>.BadRequest("Fail");
next.Invoke().Returns(Task.FromResult(successfulCommandResult));

// Act
_ = await _behavior.Handle(command, next, cancellationToken);
_ = await _behavior.Handle(command, next, CancellationToken.None);

// Assert
await _unitOfWork.DidNotReceive().CommitAsync(cancellationToken);
await _unitOfWork.DidNotReceive().CommitAsync(CancellationToken.None);
await next.Received().Invoke();
}
}
18 changes: 8 additions & 10 deletions application/shared-kernel/Tests/Persistence/RepositoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ public async Task Add_WhenNewAggregate_ShouldAddToDatabase()
{
// Arrange
var testAggregate = TestAggregate.Create("TestAggregate");
var cancellationToken = new CancellationToken();

// Act
await _testAggregateRepository.AddAsync(testAggregate, cancellationToken);
await _testDbContext.SaveChangesAsync(cancellationToken);
await _testAggregateRepository.AddAsync(testAggregate, CancellationToken.None);
await _testDbContext.SaveChangesAsync(CancellationToken.None);

// Assert
var retrievedAggregate = await _testAggregateRepository.GetByIdAsync(testAggregate.Id, cancellationToken);
var retrievedAggregate = await _testAggregateRepository.GetByIdAsync(testAggregate.Id, CancellationToken.None);
retrievedAggregate.Should().NotBeNull();
retrievedAggregate!.Id.Should().Be(testAggregate.Id);
}
Expand Down Expand Up @@ -136,26 +135,25 @@ public async Task Update_WhenEntityIsModifiedByAnotherUser_ShouldThrowConcurrenc
// Arrange
var primaryRepository = new TestAggregateRepository(_testDbContext);
var originalTestAggregate = TestAggregate.Create("TestAggregate");
var cancellationToken = new CancellationToken();
await primaryRepository.AddAsync(originalTestAggregate, cancellationToken);
await _testDbContext.SaveChangesAsync(cancellationToken);
await primaryRepository.AddAsync(originalTestAggregate, CancellationToken.None);
await _testDbContext.SaveChangesAsync(CancellationToken.None);

// Simulate another user by creating a new DbContext and repository instance
var secondaryDbContext = _sqliteInMemoryDbContextFactory.CreateContext();
var secondaryRepository = new TestAggregateRepository(secondaryDbContext);

// Act
var concurrentTestAggregate =
(await secondaryRepository.GetByIdAsync(originalTestAggregate.Id, cancellationToken))!;
(await secondaryRepository.GetByIdAsync(originalTestAggregate.Id, CancellationToken.None))!;
concurrentTestAggregate.Name = "UpdatedTestAggregateByAnotherUser";
secondaryRepository.Update(concurrentTestAggregate);
await secondaryDbContext.SaveChangesAsync(cancellationToken);
await secondaryDbContext.SaveChangesAsync(CancellationToken.None);

originalTestAggregate.Name = "UpdatedTestAggregate";
primaryRepository.Update(originalTestAggregate);

// Assert
await Assert.ThrowsAsync<DbUpdateConcurrencyException>(() => _testDbContext.SaveChangesAsync(cancellationToken));
await Assert.ThrowsAsync<DbUpdateConcurrencyException>(() => _testDbContext.SaveChangesAsync(CancellationToken.None));
}

[Fact]
Expand Down