Skip to content

Commit f540d20

Browse files
the-avid-engineerthe-avid-engineer
authored
Cleanup (#22)
* Revert "chore: publish runs on ubuntu, also needs redis/mongo instances" This reverts commit ecdfc23. * Revert "refactor: run rider reformat and cleanup" This reverts commit 3546641. * Revert "Revert "chore: publish runs on ubuntu, also needs redis/mongo instances"" This reverts commit 315c7ca. * refactor: clean * refactor: more clean * refactor: fix some warnings * chore: single class per file
1 parent ecdfc23 commit f540d20

File tree

88 files changed

+1145
-1238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1145
-1238
lines changed

‎src/.editorconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ dotnet_remove_unnecessary_suppression_exclusions = none
7070
#### C# Coding Conventions ####
7171

7272
# var preferences
73-
csharp_style_var_elsewhere = false:silent
74-
csharp_style_var_for_built_in_types = false:silent
75-
csharp_style_var_when_type_is_apparent = false:silent
73+
csharp_style_var_elsewhere = true:silent
74+
csharp_style_var_for_built_in_types = true:silent
75+
csharp_style_var_when_type_is_apparent = true:silent
7676

7777
# Expression-bodied members
7878
csharp_style_expression_bodied_accessors = true:silent

‎src/EntityDb.Common.Tests/Extensions/EntityExtensions.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,25 @@ public void GivenEntityAndRepeatedCommand_WhenExecutingAndReducing_ThenEnsureExe
1616
{
1717
// ARRANGE
1818

19-
Mock<IFact<object>>? factMock = new Mock<IFact<object>>(MockBehavior.Strict);
19+
var factMock = new Mock<IFact<object>>(MockBehavior.Strict);
2020

2121
factMock
2222
.Setup(fact => fact.Reduce(It.IsAny<object>()))
2323
.Returns((object @object) => @object)
2424
.Verifiable();
2525

26-
Mock<ICommand<object>>? commandMock = new Mock<ICommand<object>>(MockBehavior.Strict);
26+
var commandMock = new Mock<ICommand<object>>(MockBehavior.Strict);
2727

2828
commandMock
2929
.Setup(command => command.Execute(It.IsAny<object>()))
3030
.Returns(new[] { factMock.Object })
3131
.Verifiable();
3232

33-
ICommand<object>? command = commandMock.Object;
34-
35-
object? entity = new object();
33+
var entity = new object();
3634

3735
// ACT
3836

39-
entity.ExecuteAndReduce(Enumerable.Repeat(command, numberOfTimes));
37+
entity.ExecuteAndReduce(Enumerable.Repeat(commandMock.Object, numberOfTimes));
4038

4139
// ASSERT
4240

‎src/EntityDb.Common.Tests/Extensions/IFilterBuilderExtensions.cs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class IFilterBuilderExtensionsTests
1111
{
1212
private IFilterBuilder<bool> GetFilterBuilder()
1313
{
14-
Mock<IFilterBuilder<bool>>? filterBuilderMock = new Mock<IFilterBuilder<bool>>(MockBehavior.Strict);
14+
var filterBuilderMock = new Mock<IFilterBuilder<bool>>(MockBehavior.Strict);
1515

1616
filterBuilderMock
1717
.Setup(builder => builder.Not(It.IsAny<bool>()))
@@ -33,15 +33,15 @@ public void NotTruthTable()
3333
{
3434
// ARRANGE
3535

36-
SingleInput[]? truthTable = new SingleInput[] { new(true, false), new(false, true) };
36+
var truthTable = new SingleInput[] { new(true, false), new(false, true) };
3737

38-
IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
38+
var filterBuilder = GetFilterBuilder();
3939

4040
foreach (var entry in truthTable)
4141
{
4242
// ACT
4343

44-
bool actualOutput = filterBuilder.Not(entry.Input1);
44+
var actualOutput = filterBuilder.Not(entry.Input1);
4545

4646
// ASSERT
4747

@@ -54,18 +54,18 @@ public void AndTruthTable()
5454
{
5555
// ARRANGE
5656

57-
DoubleInput[]? truthTable = new DoubleInput[]
57+
var truthTable = new DoubleInput[]
5858
{
5959
new(false, false, false), new(false, true, false), new(true, false, false), new(true, true, true)
6060
};
6161

62-
IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
62+
var filterBuilder = GetFilterBuilder();
6363

6464
foreach (var entry in truthTable)
6565
{
6666
// ACT
6767

68-
bool actualOutput = filterBuilder.And(entry.Input1, entry.Input2);
68+
var actualOutput = filterBuilder.And(entry.Input1, entry.Input2);
6969

7070
// ASSERT
7171

@@ -79,18 +79,18 @@ public void OrTruthTable()
7979
{
8080
// ARRANGE
8181

82-
DoubleInput[]? truthTable = new DoubleInput[]
82+
var truthTable = new DoubleInput[]
8383
{
8484
new(false, false, false), new(false, true, true), new(true, false, true), new(true, true, true)
8585
};
8686

87-
IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
87+
var filterBuilder = GetFilterBuilder();
8888

8989
foreach (var entry in truthTable)
9090
{
9191
// ACT
9292

93-
bool actualOutput = filterBuilder.Or(entry.Input1, entry.Input2);
93+
var actualOutput = filterBuilder.Or(entry.Input1, entry.Input2);
9494

9595
// ASSERT
9696

@@ -103,18 +103,18 @@ public void NandTruthTable()
103103
{
104104
// ARRANGE
105105

106-
DoubleInput[]? truthTable = new DoubleInput[]
106+
var truthTable = new DoubleInput[]
107107
{
108108
new(false, false, true), new(false, true, true), new(true, false, true), new(true, true, false)
109109
};
110110

111-
IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
111+
var filterBuilder = GetFilterBuilder();
112112

113113
foreach (var entry in truthTable)
114114
{
115115
// ACT
116116

117-
bool actualOutput = filterBuilder.Nand(entry.Input1, entry.Input2);
117+
var actualOutput = filterBuilder.Nand(entry.Input1, entry.Input2);
118118

119119
// ASSERT
120120

@@ -127,18 +127,18 @@ public void NorTruthTable()
127127
{
128128
// ARRANGE
129129

130-
DoubleInput[]? truthTable = new DoubleInput[]
130+
var truthTable = new DoubleInput[]
131131
{
132132
new(false, false, true), new(false, true, false), new(true, false, false), new(true, true, false)
133133
};
134134

135-
IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
135+
var filterBuilder = GetFilterBuilder();
136136

137137
foreach (var entry in truthTable)
138138
{
139139
// ACT
140140

141-
bool actualOutput = filterBuilder.Nor(entry.Input1, entry.Input2);
141+
var actualOutput = filterBuilder.Nor(entry.Input1, entry.Input2);
142142

143143
// ASSERT
144144

@@ -152,18 +152,18 @@ public void XorTruthTable()
152152
{
153153
// ARRANGE
154154

155-
DoubleInput[]? truthTable = new DoubleInput[]
155+
var truthTable = new DoubleInput[]
156156
{
157157
new(false, false, false), new(false, true, true), new(true, false, true), new(true, true, false)
158158
};
159159

160-
IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
160+
var filterBuilder = GetFilterBuilder();
161161

162162
foreach (var entry in truthTable)
163163
{
164164
// ACT
165165

166-
bool actualOutput = filterBuilder.Xor(entry.Input1, entry.Input2);
166+
var actualOutput = filterBuilder.Xor(entry.Input1, entry.Input2);
167167

168168
// ASSERT
169169

@@ -176,18 +176,18 @@ public void XnorTruthTable()
176176
{
177177
// ARRANGE
178178

179-
DoubleInput[]? truthTable = new DoubleInput[]
179+
var truthTable = new DoubleInput[]
180180
{
181181
new(false, false, true), new(false, true, false), new(true, false, false), new(true, true, true)
182182
};
183183

184-
IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
184+
var filterBuilder = GetFilterBuilder();
185185

186186
foreach (var entry in truthTable)
187187
{
188188
// ACT
189189

190-
bool actualOutput = filterBuilder.Xnor(entry.Input1, entry.Input2);
190+
var actualOutput = filterBuilder.Xnor(entry.Input1, entry.Input2);
191191

192192
// ASSERT
193193

‎src/EntityDb.Common.Tests/Extensions/IServiceProviderExtensionsTests.cs‎

Lines changed: 64 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,64 @@
1-
using EntityDb.Abstractions.Leases;
2-
using EntityDb.Common.Extensions;
3-
using EntityDb.TestImplementations.Commands;
4-
using EntityDb.TestImplementations.Entities;
5-
using Shouldly;
6-
using System;
7-
using Xunit;
8-
9-
namespace EntityDb.Common.Tests.Extensions
10-
{
11-
public class IServiceProviderExtensionsTests : TestsBase
12-
{
13-
public IServiceProviderExtensionsTests(IServiceProvider serviceProvider) : base(serviceProvider)
14-
{
15-
}
16-
17-
[Fact]
18-
public void GivenNoLeasingStrategy_WhenGettingLeases_ThenReturnEmptyArray()
19-
{
20-
// ARRANGE
21-
22-
IServiceProvider? serviceProvider = GetEmptyServiceProvider();
23-
24-
// ACT
25-
26-
ILease[]? leases = serviceProvider.GetLeases(new TransactionEntity());
27-
28-
// ASSERT
29-
30-
leases.ShouldBeEmpty();
31-
}
32-
33-
[Fact]
34-
public void GivenNoAuthorizingStrategy_ThenIsAuthorizedReturnsTrue()
35-
{
36-
// ARRANGE
37-
38-
IServiceProvider? serviceProvider = GetEmptyServiceProvider();
39-
40-
// ACT
41-
42-
bool isAuthorized = serviceProvider.IsAuthorized(new TransactionEntity(), new DoNothing());
43-
44-
// ASSERT
45-
46-
isAuthorized.ShouldBeTrue();
47-
}
48-
49-
[Fact]
50-
public void GivenNoCachingStrategy_WhenCheckingIfShouldCache_ThenReturnFalse()
51-
{
52-
// ARRANGE
53-
54-
IServiceProvider? serviceProvider = GetEmptyServiceProvider();
55-
56-
// ACT
57-
58-
bool shouldCache = serviceProvider.ShouldPutSnapshot<TransactionEntity>(default, default!);
59-
60-
// ASSERT
61-
62-
shouldCache.ShouldBeFalse();
63-
}
64-
}
65-
}
1+
using EntityDb.Common.Extensions;
2+
using EntityDb.TestImplementations.Commands;
3+
using EntityDb.TestImplementations.Entities;
4+
using Shouldly;
5+
using System;
6+
using Xunit;
7+
8+
namespace EntityDb.Common.Tests.Extensions
9+
{
10+
public class IServiceProviderExtensionsTests : TestsBase
11+
{
12+
public IServiceProviderExtensionsTests(IServiceProvider serviceProvider) : base(serviceProvider)
13+
{
14+
}
15+
16+
[Fact]
17+
public void GivenNoLeasingStrategy_WhenGettingLeases_ThenReturnEmptyArray()
18+
{
19+
// ARRANGE
20+
21+
var serviceProvider = GetEmptyServiceProvider();
22+
23+
// ACT
24+
25+
var leases = serviceProvider.GetLeases(new TransactionEntity());
26+
27+
// ASSERT
28+
29+
leases.ShouldBeEmpty();
30+
}
31+
32+
[Fact]
33+
public void GivenNoAuthorizingStrategy_ThenIsAuthorizedReturnsTrue()
34+
{
35+
// ARRANGE
36+
37+
var serviceProvider = GetEmptyServiceProvider();
38+
39+
// ACT
40+
41+
var isAuthorized = serviceProvider.IsAuthorized(new TransactionEntity(), new DoNothing());
42+
43+
// ASSERT
44+
45+
isAuthorized.ShouldBeTrue();
46+
}
47+
48+
[Fact]
49+
public void GivenNoCachingStrategy_WhenCheckingIfShouldCache_ThenReturnFalse()
50+
{
51+
// ARRANGE
52+
53+
var serviceProvider = GetEmptyServiceProvider();
54+
55+
// ACT
56+
57+
var shouldCache = serviceProvider.ShouldPutSnapshot<TransactionEntity>(default, default!);
58+
59+
// ASSERT
60+
61+
shouldCache.ShouldBeFalse();
62+
}
63+
}
64+
}

0 commit comments

Comments
 (0)