Removes parameterless constructor from Engine and fixes test

LeeARichardson · Feb 14, 2018 · 028d7d7 · 028d7d7
1 parent cfbeb80
commit 028d7d7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/Sharpasonne.Tests/Rules/AdjacentFeaturesMatchRuleTest.cs b/Sharpasonne.Tests/Rules/AdjacentFeaturesMatchRuleTest.cs
@@ -1,12 +1,10 @@
-using System.Collections.Generic;
-using System.Linq;
-using Sharpasonne.GameActions;
+using Sharpasonne.GameActions;
 using Sharpasonne.Models;
 using Sharpasonne.Models.Features;
 using Sharpasonne.Rules;
 using Xunit;
 using System.Collections.Immutable;
-using System.Diagnostics;
+using Moq;
 using Optional.Unsafe;
 
 namespace Sharpasonne.Tests.Rules
@@ -16,7 +14,12 @@ public class AdjacentFeaturesMatchRuleTest : UnitTest<PlaceTileGameAction>
         [Fact]
         public void Given_Empty_Then_True()
         {
-            AssertTrue<AdjacentFeaturesMatchRule>(new Engine(), MakePlaceTile(0, 0));
+            var mockEngine = new Mock<IEngine>();
+            mockEngine
+                .Setup(e => e.Board)
+                .Returns(new Board());
+
+            AssertTrue<AdjacentFeaturesMatchRule>(mockEngine.Object, MakePlaceTile(0, 0));
         }
 
         [Fact]

diff --git a/Sharpasonne.Tests/Rules/HasAdjacentTileRuleTests.cs b/Sharpasonne.Tests/Rules/HasAdjacentTileRuleTests.cs
@@ -1,13 +1,8 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using Sharpasonne.GameActions;
+using Sharpasonne.GameActions;
 using Sharpasonne.Rules;
 using Xunit;
 using Moq;
-using Optional.Unsafe;
 using Sharpasonne.Models;
-using Sharpasonne.Models.Features;
 
 namespace Sharpasonne.Tests.Rules
 {
@@ -16,7 +11,12 @@ public class HasAdjacentTileRuleTests : UnitTest<PlaceTileGameAction>
         [Fact]
         public void Given_BoardIsEmpty_When_PlacingATile_Then_Validates()
         {
-            AssertTrue<HasAdjacentTileRule>(new Engine(), MakePlaceTile(0, 0));
+            var mockEngine = new Mock<IEngine>();
+            mockEngine
+                .Setup(e => e.Board)
+                .Returns(new Board());
+
+            AssertTrue<HasAdjacentTileRule>(mockEngine.Object, MakePlaceTile(0, 0));
         }
 
         [Fact]

diff --git a/Sharpasonne.Tests/Rules/SpaceIsEmptyRuleTests.cs b/Sharpasonne.Tests/Rules/SpaceIsEmptyRuleTests.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Moq;
 using Sharpasonne.GameActions;
 using Sharpasonne.Rules;
 using Xunit;
@@ -11,7 +12,12 @@ public class SpaceIsEmptyRuleTests : UnitTest<PlaceTileGameAction>
         [Fact]
         public void When_TileIsEmpty_Then_True()
         {
-            AssertTrue<SpaceIsEmptyRule>(new Engine(), MakePlaceTile(0, 0));
+            var mockEngine = new Mock<IEngine>();
+            mockEngine
+                .Setup(e => e.Board)
+                .Returns(new Board());
+
+            AssertTrue<SpaceIsEmptyRule>(mockEngine.Object, MakePlaceTile(0, 0));
         }
 
         [Fact]

diff --git a/Sharpasonne.Tests/Rules/UniqueTileInstanceRuleTests.cs b/Sharpasonne.Tests/Rules/UniqueTileInstanceRuleTests.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Moq;
 using Sharpasonne.GameActions;
 using Sharpasonne.Models;
 using Sharpasonne.Rules;
@@ -12,7 +13,12 @@ public class UniqueTileInstanceRuleTests : UnitTest<PlaceTileGameAction>
         [Fact]
         public void When_BoardIsEmpty_Then_True()
         {
-            AssertTrue<UniqueTileInstanceRule>(new Engine(), MakePlaceTile(0, 0));
+            var mockEngine = new Mock<IEngine>();
+            mockEngine
+                .Setup(e => e.Board)
+                .Returns(new Board());
+
+            AssertTrue<UniqueTileInstanceRule>(mockEngine.Object, MakePlaceTile(0, 0));
         }
 
         [Fact]

diff --git a/Sharpasonne/Engine.cs b/Sharpasonne/Engine.cs
@@ -18,10 +18,6 @@ public class Engine : IEngine
         public IImmutableDictionary<Type, IImmutableList<IRule<IGameAction>>> Rules { get; }
             = ImmutableDictionary<Type, IImmutableList<IRule<IGameAction>>>.Empty;
 
-        public Engine()
-        {
-        }
-
         /// <summary>
         /// 
         /// </summary>