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
entitydb-io · Oct 4, 2021 · f540d20 · f540d20
1 parent ecdfc23
commit f540d20
Show file tree

Hide file tree

Showing 88 changed files with 1,145 additions and 1,238 deletions.
diff --git a/src/.editorconfig b/src/.editorconfig
@@ -70,9 +70,9 @@ dotnet_remove_unnecessary_suppression_exclusions = none
 #### C# Coding Conventions ####
 
 # var preferences
-csharp_style_var_elsewhere = false:silent
-csharp_style_var_for_built_in_types = false:silent
-csharp_style_var_when_type_is_apparent = false:silent
+csharp_style_var_elsewhere = true:silent
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
 
 # Expression-bodied members
 csharp_style_expression_bodied_accessors = true:silent

diff --git a/src/EntityDb.Common.Tests/Extensions/EntityExtensions.cs b/src/EntityDb.Common.Tests/Extensions/EntityExtensions.cs
@@ -16,27 +16,25 @@ public void GivenEntityAndRepeatedCommand_WhenExecutingAndReducing_ThenEnsureExe
         {
             // ARRANGE
 
-            Mock<IFact<object>>? factMock = new Mock<IFact<object>>(MockBehavior.Strict);
+            var factMock = new Mock<IFact<object>>(MockBehavior.Strict);
 
             factMock
                 .Setup(fact => fact.Reduce(It.IsAny<object>()))
                 .Returns((object @object) => @object)
                 .Verifiable();
 
-            Mock<ICommand<object>>? commandMock = new Mock<ICommand<object>>(MockBehavior.Strict);
+            var commandMock = new Mock<ICommand<object>>(MockBehavior.Strict);
 
             commandMock
                 .Setup(command => command.Execute(It.IsAny<object>()))
                 .Returns(new[] { factMock.Object })
                 .Verifiable();
 
-            ICommand<object>? command = commandMock.Object;
-
-            object? entity = new object();
+            var entity = new object();
 
             // ACT
 
-            entity.ExecuteAndReduce(Enumerable.Repeat(command, numberOfTimes));
+            entity.ExecuteAndReduce(Enumerable.Repeat(commandMock.Object, numberOfTimes));
 
             // ASSERT
 

diff --git a/src/EntityDb.Common.Tests/Extensions/IFilterBuilderExtensions.cs b/src/EntityDb.Common.Tests/Extensions/IFilterBuilderExtensions.cs
@@ -11,7 +11,7 @@ public class IFilterBuilderExtensionsTests
     {
         private IFilterBuilder<bool> GetFilterBuilder()
         {
-            Mock<IFilterBuilder<bool>>? filterBuilderMock = new Mock<IFilterBuilder<bool>>(MockBehavior.Strict);
+            var filterBuilderMock = new Mock<IFilterBuilder<bool>>(MockBehavior.Strict);
 
             filterBuilderMock
                 .Setup(builder => builder.Not(It.IsAny<bool>()))
@@ -33,15 +33,15 @@ public void NotTruthTable()
         {
             // ARRANGE
 
-            SingleInput[]? truthTable = new SingleInput[] { new(true, false), new(false, true) };
+            var truthTable = new SingleInput[] { new(true, false), new(false, true) };
 
-            IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
+            var filterBuilder = GetFilterBuilder();
 
             foreach (var entry in truthTable)
             {
                 // ACT
 
-                bool actualOutput = filterBuilder.Not(entry.Input1);
+                var actualOutput = filterBuilder.Not(entry.Input1);
 
                 // ASSERT
 
@@ -54,18 +54,18 @@ public void AndTruthTable()
         {
             // ARRANGE
 
-            DoubleInput[]? truthTable = new DoubleInput[]
+            var truthTable = new DoubleInput[]
             {
                 new(false, false, false), new(false, true, false), new(true, false, false), new(true, true, true)
             };
 
-            IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
+            var filterBuilder = GetFilterBuilder();
 
             foreach (var entry in truthTable)
             {
                 // ACT
 
-                bool actualOutput = filterBuilder.And(entry.Input1, entry.Input2);
+                var actualOutput = filterBuilder.And(entry.Input1, entry.Input2);
 
                 // ASSERT
 
@@ -79,18 +79,18 @@ public void OrTruthTable()
         {
             // ARRANGE
 
-            DoubleInput[]? truthTable = new DoubleInput[]
+            var truthTable = new DoubleInput[]
             {
                 new(false, false, false), new(false, true, true), new(true, false, true), new(true, true, true)
             };
 
-            IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
+            var filterBuilder = GetFilterBuilder();
 
             foreach (var entry in truthTable)
             {
                 // ACT
 
-                bool actualOutput = filterBuilder.Or(entry.Input1, entry.Input2);
+                var actualOutput = filterBuilder.Or(entry.Input1, entry.Input2);
 
                 // ASSERT
 
@@ -103,18 +103,18 @@ public void NandTruthTable()
         {
             // ARRANGE
 
-            DoubleInput[]? truthTable = new DoubleInput[]
+            var truthTable = new DoubleInput[]
             {
                 new(false, false, true), new(false, true, true), new(true, false, true), new(true, true, false)
             };
 
-            IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
+            var filterBuilder = GetFilterBuilder();
 
             foreach (var entry in truthTable)
             {
                 // ACT
 
-                bool actualOutput = filterBuilder.Nand(entry.Input1, entry.Input2);
+                var actualOutput = filterBuilder.Nand(entry.Input1, entry.Input2);
 
                 // ASSERT
 
@@ -127,18 +127,18 @@ public void NorTruthTable()
         {
             // ARRANGE
 
-            DoubleInput[]? truthTable = new DoubleInput[]
+            var truthTable = new DoubleInput[]
             {
                 new(false, false, true), new(false, true, false), new(true, false, false), new(true, true, false)
             };
 
-            IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
+            var filterBuilder = GetFilterBuilder();
 
             foreach (var entry in truthTable)
             {
                 // ACT
 
-                bool actualOutput = filterBuilder.Nor(entry.Input1, entry.Input2);
+                var actualOutput = filterBuilder.Nor(entry.Input1, entry.Input2);
 
                 // ASSERT
 
@@ -152,18 +152,18 @@ public void XorTruthTable()
         {
             // ARRANGE
 
-            DoubleInput[]? truthTable = new DoubleInput[]
+            var truthTable = new DoubleInput[]
             {
                 new(false, false, false), new(false, true, true), new(true, false, true), new(true, true, false)
             };
 
-            IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
+            var filterBuilder = GetFilterBuilder();
 
             foreach (var entry in truthTable)
             {
                 // ACT
 
-                bool actualOutput = filterBuilder.Xor(entry.Input1, entry.Input2);
+                var actualOutput = filterBuilder.Xor(entry.Input1, entry.Input2);
 
                 // ASSERT
 
@@ -176,18 +176,18 @@ public void XnorTruthTable()
         {
             // ARRANGE
 
-            DoubleInput[]? truthTable = new DoubleInput[]
+            var truthTable = new DoubleInput[]
             {
                 new(false, false, true), new(false, true, false), new(true, false, false), new(true, true, true)
             };
 
-            IFilterBuilder<bool>? filterBuilder = GetFilterBuilder();
+            var filterBuilder = GetFilterBuilder();
 
             foreach (var entry in truthTable)
             {
                 // ACT
 
-                bool actualOutput = filterBuilder.Xnor(entry.Input1, entry.Input2);
+                var actualOutput = filterBuilder.Xnor(entry.Input1, entry.Input2);
 
                 // ASSERT
 

diff --git a/src/EntityDb.Common.Tests/Extensions/IServiceProviderExtensionsTests.cs b/src/EntityDb.Common.Tests/Extensions/IServiceProviderExtensionsTests.cs
@@ -1,65 +1,64 @@
-using EntityDb.Abstractions.Leases;
-using EntityDb.Common.Extensions;
-using EntityDb.TestImplementations.Commands;
-using EntityDb.TestImplementations.Entities;
-using Shouldly;
-using System;
-using Xunit;
-
-namespace EntityDb.Common.Tests.Extensions
-{
-    public class IServiceProviderExtensionsTests : TestsBase
-    {
-        public IServiceProviderExtensionsTests(IServiceProvider serviceProvider) : base(serviceProvider)
-        {
-        }
-
-        [Fact]
-        public void GivenNoLeasingStrategy_WhenGettingLeases_ThenReturnEmptyArray()
-        {
-            // ARRANGE
-
-            IServiceProvider? serviceProvider = GetEmptyServiceProvider();
-
-            // ACT
-
-            ILease[]? leases = serviceProvider.GetLeases(new TransactionEntity());
-
-            // ASSERT
-
-            leases.ShouldBeEmpty();
-        }
-
-        [Fact]
-        public void GivenNoAuthorizingStrategy_ThenIsAuthorizedReturnsTrue()
-        {
-            // ARRANGE
-
-            IServiceProvider? serviceProvider = GetEmptyServiceProvider();
-
-            // ACT
-
-            bool isAuthorized = serviceProvider.IsAuthorized(new TransactionEntity(), new DoNothing());
-
-            // ASSERT
-
-            isAuthorized.ShouldBeTrue();
-        }
-
-        [Fact]
-        public void GivenNoCachingStrategy_WhenCheckingIfShouldCache_ThenReturnFalse()
-        {
-            // ARRANGE
-
-            IServiceProvider? serviceProvider = GetEmptyServiceProvider();
-
-            // ACT
-
-            bool shouldCache = serviceProvider.ShouldPutSnapshot<TransactionEntity>(default, default!);
-
-            // ASSERT
-
-            shouldCache.ShouldBeFalse();
-        }
-    }
-}
+using EntityDb.Common.Extensions;
+using EntityDb.TestImplementations.Commands;
+using EntityDb.TestImplementations.Entities;
+using Shouldly;
+using System;
+using Xunit;
+
+namespace EntityDb.Common.Tests.Extensions
+{
+    public class IServiceProviderExtensionsTests : TestsBase
+    {
+        public IServiceProviderExtensionsTests(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+        }
+
+        [Fact]
+        public void GivenNoLeasingStrategy_WhenGettingLeases_ThenReturnEmptyArray()
+        {
+            // ARRANGE
+
+            var serviceProvider = GetEmptyServiceProvider();
+
+            // ACT
+
+            var leases = serviceProvider.GetLeases(new TransactionEntity());
+
+            // ASSERT
+
+            leases.ShouldBeEmpty();
+        }
+
+        [Fact]
+        public void GivenNoAuthorizingStrategy_ThenIsAuthorizedReturnsTrue()
+        {
+            // ARRANGE
+
+            var serviceProvider = GetEmptyServiceProvider();
+
+            // ACT
+
+            var isAuthorized = serviceProvider.IsAuthorized(new TransactionEntity(), new DoNothing());
+
+            // ASSERT
+
+            isAuthorized.ShouldBeTrue();
+        }
+
+        [Fact]
+        public void GivenNoCachingStrategy_WhenCheckingIfShouldCache_ThenReturnFalse()
+        {
+            // ARRANGE
+
+            var serviceProvider = GetEmptyServiceProvider();
+
+            // ACT
+
+            var shouldCache = serviceProvider.ShouldPutSnapshot<TransactionEntity>(default, default!);
+
+            // ASSERT
+
+            shouldCache.ShouldBeFalse();
+        }
+    }
+}