Skip to content

Commit e3363a3

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #361 from TransactionProcessing/deepsource-autofix-da5ac335
refactor: drop explicit types on new expressions
2 parents 8b7949b + 0b32713 commit e3363a3

10 files changed

Lines changed: 90 additions & 100 deletions

‎Shared.EventStore.Tests/AggregateExtensionsTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class AggregateExtensionsTests{
1515
public void AggregateExtensions_Apply_EventIsApplied()
1616
{
1717
TestAggregate t = TestAggregate.Create(TestData.AggregateId);
18-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
18+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
1919
t.Apply(aggregateNameSetEvent);
2020
t.AggregateName.ShouldBe("Test");
2121
}
@@ -24,7 +24,7 @@ public void AggregateExtensions_Apply_EventIsApplied()
2424
public void AggregateExtensions_Apply_DuplicateEvent_EventIsSilentlyHandled()
2525
{
2626
TestAggregate t = TestAggregate.Create(TestData.AggregateId);
27-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
27+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
2828
t.Apply(aggregateNameSetEvent);
2929
t.AggregateName.ShouldBe("Test");
3030
t.Apply(aggregateNameSetEvent);
@@ -34,7 +34,7 @@ public void AggregateExtensions_Apply_DuplicateEvent_EventIsSilentlyHandled()
3434
public void AggregateExtensions_GetHistoricalEvents_EventsReturned()
3535
{
3636
TestAggregate t = TestAggregate.Create(TestData.AggregateId);
37-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
37+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
3838
t.Apply(aggregateNameSetEvent);
3939
t.AggregateName.ShouldBe("Test");
4040
IList<IDomainEvent> events = t.GetHistoricalEvents();

‎Shared.EventStore.Tests/AggregateRepositoryManagerTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace Shared.EventStore.Tests;
1313
public class AggregateRepositoryManagerTests{
1414
[Fact]
1515
public void AggregateRepositoryManager_GetAggregateRepository_AggregateRepositoryReturned(){
16-
Mock<IEventStoreContextManager> eventStoreContextManager = new Mock<IEventStoreContextManager>();
16+
Mock<IEventStoreContextManager> eventStoreContextManager = new();
1717
IDomainEventFactory<IDomainEvent> factory = new DomainEventFactory();
18-
AggregateRepositoryManager aggregateRepositoryManager = new AggregateRepositoryManager(eventStoreContextManager.Object, factory);
18+
AggregateRepositoryManager aggregateRepositoryManager = new(eventStoreContextManager.Object, factory);
1919
IAggregateRepository<TestAggregate, DomainEvent> r = aggregateRepositoryManager.GetAggregateRepository<TestAggregate, DomainEvent>(Guid.NewGuid());
2020
r.ShouldNotBeNull();
2121

‎Shared.EventStore.Tests/AggregateRepositoryTests.cs‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ namespace Shared.EventStore.Tests;
1818
public class AggregateRepositoryTests{
1919
[Fact]
2020
public async Task AggregateRepository_GetLatestVersion_AggregateReturned(){
21-
Mock<IEventStoreContext> context = new Mock<IEventStoreContext>();
21+
Mock<IEventStoreContext> context = new();
2222
IDomainEventFactory<IDomainEvent> factory = new DomainEventFactory();
23-
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object,factory);
23+
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new(context.Object,factory);
2424

25-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
25+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
2626
EventRecord r = TestData.CreateEventRecord<AggregateNameSetEvent>(aggregateNameSetEvent, "TestAggregate");
27-
List<ResolvedEvent> e = new List<ResolvedEvent>{
27+
List<ResolvedEvent> e = new(){
2828
new ResolvedEvent(r, null, null)
2929
};
3030
context.Setup(c => c.ReadEvents(It.IsAny<String>(), It.IsAny<Int64>(), It.IsAny<CancellationToken>())).ReturnsAsync(e);
@@ -49,15 +49,16 @@ public async Task AggregateRepository_GetLatestVersion_NotFound_AggregateReturne
4949
[Fact]
5050
public async Task AggregateRepository_GetLatestVersion_ErrorApplyingEvents_ErrorThrown()
5151
{
52-
Mock<IEventStoreContext> context = new Mock<IEventStoreContext>();
52+
Mock<IEventStoreContext> context = new();
5353
IDomainEventFactory<IDomainEvent> factory = new DomainEventFactory();
54-
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
55-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Error");
54+
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new(context.Object, factory);
55+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Error");
5656
EventRecord r = TestData.CreateEventRecord<AggregateNameSetEvent>(aggregateNameSetEvent, "TestAggregate");
5757

58-
List<ResolvedEvent> e = new List<ResolvedEvent>{
59-
new ResolvedEvent(r, null, null)
60-
};
58+
List<ResolvedEvent> e = new()
59+
{
60+
new ResolvedEvent(r, null, null)
61+
};
6162
context.Setup(c => c.ReadEvents(It.IsAny<String>(), It.IsAny<Int64>(), It.IsAny<CancellationToken>())).ReturnsAsync(e);
6263
Result<TestAggregate> result = await testAggregateRepository.GetLatestVersion(TestData.AggregateId, CancellationToken.None);
6364
result.IsFailed.ShouldBeTrue();
@@ -81,14 +82,14 @@ public async Task AggregateRepository_GetLatestVersion_NoEvents_AggregateReturne
8182
[Fact]
8283
public async Task AggregateRepository_GetLatestVersionFromLastEvent_AggregateReturned()
8384
{
84-
Mock<IEventStoreContext> context = new Mock<IEventStoreContext>();
85+
Mock<IEventStoreContext> context = new();
8586
IDomainEventFactory<IDomainEvent> factory = new DomainEventFactory();
8687

87-
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
88+
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new(context.Object, factory);
8889

89-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
90+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
9091
EventRecord r = TestData.CreateEventRecord<AggregateNameSetEvent>(aggregateNameSetEvent, "TestAggregate");
91-
List<ResolvedEvent> e = new List<ResolvedEvent>{
92+
List<ResolvedEvent> e = new(){
9293
new ResolvedEvent(r, null, null)
9394
};
9495
context.Setup(c => c.GetEventsBackward(It.IsAny<String>(), It.IsAny<Int32>(), It.IsAny<CancellationToken>())).ReturnsAsync(e);
@@ -100,17 +101,17 @@ public async Task AggregateRepository_GetLatestVersionFromLastEvent_AggregateRet
100101
[Fact]
101102
public async Task AggregateRepository_SaveChanges_NoChangesMade_ChangesAreSaved()
102103
{
103-
Mock<IEventStoreContext> context = new Mock<IEventStoreContext>();
104+
Mock<IEventStoreContext> context = new();
104105
IDomainEventFactory<IDomainEvent> factory = new DomainEventFactory();
105106

106-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
107+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
107108
EventRecord r = TestData.CreateEventRecord<AggregateNameSetEvent>(aggregateNameSetEvent, "TestAggregate");
108-
List<ResolvedEvent> e = new List<ResolvedEvent>{
109+
List<ResolvedEvent> e = new(){
109110
new ResolvedEvent(r, null, null)
110111
};
111112
context.Setup(c => c.GetEventsBackward(It.IsAny<String>(), It.IsAny<Int32>(), It.IsAny<CancellationToken>())).ReturnsAsync(e);
112113

113-
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
114+
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new(context.Object, factory);
114115
Result<TestAggregate> testAggregate = await testAggregateRepository.GetLatestVersionFromLastEvent(TestData.AggregateId, CancellationToken.None);
115116

116117
Result result = await testAggregateRepository.SaveChanges(testAggregate.Data, CancellationToken.None);
@@ -120,18 +121,18 @@ public async Task AggregateRepository_SaveChanges_NoChangesMade_ChangesAreSaved(
120121
[Fact]
121122
public async Task AggregateRepository_SaveChanges_ErrorsOnInsert_FailedResult()
122123
{
123-
Mock<IEventStoreContext> context = new Mock<IEventStoreContext>();
124+
Mock<IEventStoreContext> context = new();
124125
IDomainEventFactory<IDomainEvent> factory = new DomainEventFactory();
125126

126-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
127+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
127128
EventRecord r = TestData.CreateEventRecord<AggregateNameSetEvent>(aggregateNameSetEvent, "TestAggregate");
128-
List<ResolvedEvent> e = new List<ResolvedEvent>{
129+
List<ResolvedEvent> e = new() {
129130
new ResolvedEvent(r, null, null)
130131
};
131132
context.Setup(c => c.GetEventsBackward(It.IsAny<String>(), It.IsAny<Int32>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(e));
132133
context.Setup(c => c.InsertEvents(It.IsAny<String>(), It.IsAny<long>(), It.IsAny<List<EventData>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Failure("error"));
133134

134-
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
135+
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new(context.Object, factory);
135136
Result<TestAggregate> testAggregate = await testAggregateRepository.GetLatestVersionFromLastEvent(TestData.AggregateId, CancellationToken.None);
136137
testAggregate.Data.SetAggregateName("New name", Guid.NewGuid());
137138
Result result = await testAggregateRepository.SaveChanges(testAggregate.Data, CancellationToken.None);
@@ -141,14 +142,14 @@ public async Task AggregateRepository_SaveChanges_ErrorsOnInsert_FailedResult()
141142
[Fact]
142143
public async Task AggregateRepository_GetLatestVersionFromLastEvent_GetEventsFailed_FailedResult()
143144
{
144-
Mock<IEventStoreContext> context = new Mock<IEventStoreContext>();
145+
Mock<IEventStoreContext> context = new();
145146
IDomainEventFactory<IDomainEvent> factory = new DomainEventFactory();
146147

147-
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
148+
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new(context.Object, factory);
148149

149-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
150+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
150151
EventRecord r = TestData.CreateEventRecord<AggregateNameSetEvent>(aggregateNameSetEvent, "TestAggregate");
151-
List<ResolvedEvent> e = new List<ResolvedEvent>{
152+
List<ResolvedEvent> e = new(){
152153
new ResolvedEvent(r, null, null)
153154
};
154155
context.Setup(c => c.GetEventsBackward(It.IsAny<String>(), It.IsAny<Int32>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Failure("error"));
@@ -160,18 +161,18 @@ public async Task AggregateRepository_GetLatestVersionFromLastEvent_GetEventsFai
160161
[Fact]
161162
public async Task AggregateRepository_SaveChanges_ChangesMade_ChangesAreSaved()
162163
{
163-
Mock<IEventStoreContext> context = new Mock<IEventStoreContext>();
164+
Mock<IEventStoreContext> context = new();
164165
context.Setup(c => c.InsertEvents(It.IsAny<String>(), It.IsAny<long>(), It.IsAny<List<EventData>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success);
165166
IDomainEventFactory<IDomainEvent> factory = new DomainEventFactory();
166167

167-
AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
168+
AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test");
168169
EventRecord r = TestData.CreateEventRecord<AggregateNameSetEvent>(aggregateNameSetEvent, "TestAggregate");
169-
List<ResolvedEvent> e = new List<ResolvedEvent>{
170+
List<ResolvedEvent> e = new() {
170171
new ResolvedEvent(r, null, null)
171172
};
172173
context.Setup(c => c.GetEventsBackward(It.IsAny<String>(), It.IsAny<Int32>(), It.IsAny<CancellationToken>())).ReturnsAsync(e);
173174

174-
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
175+
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new(context.Object, factory);
175176
Result<TestAggregate> testAggregaterResult = await testAggregateRepository.GetLatestVersionFromLastEvent(TestData.AggregateId, CancellationToken.None);
176177
var testAggregate = testAggregaterResult.Data;
177178
testAggregate.SetAggregateName("New name", Guid.NewGuid());

0 commit comments

Comments
 (0)