Refactoring and Testing

Author: 0x007E

App/App.csproj

@@ -6,6 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>Blocks</AssemblyName>
     <RootNamespace>Ragae.Game.Blocks.App</RootNamespace>
+    <ApplicationIcon>ICON.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>

App/ICON.ico

@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GameLibTest", "GameLibTest\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppLib", "AppLib\AppLib.csproj", "{076981BD-B63D-42BF-ABF1-D5A72C9F7F55}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataLib", "DataLib\DataLib.csproj", "{0E17919B-BB0E-45CC-9C27-F2D66CECF144}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLib", "DataLib\DataLib.csproj", "{0E17919B-BB0E-45CC-9C27-F2D66CECF144}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Blocks.sln

@@ -24,4 +24,8 @@
     <ProjectReference Include="..\GameLib\GameLib.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+
 </Project>

GameLibTest/GameLibTest.csproj

@@ -3,6 +3,7 @@
 using System.Drawing;
 using static GameLibTest.Helper.GameLibHelper;
 using Xunit;
+using System.Collections.Generic;
 
 namespace GameLibTest
 {
@@ -21,52 +22,61 @@ public void CreateMovement_Passing()
             Assert.NotNull(movement.Field);
         }
 
-        [Fact]
-        public void CreateMovementWithEmptyFieldAndMoveDown_Passing()
+        public static IEnumerable<object[]> GetMovementData()
         {
-            Movement movement = factory.CreateMovement(factory.CreateField());
-
-            Assert.NotNull(movement);
-            Assert.NotNull(movement.Field);
-
-            movement.Field.Current = factory.CreateFieldBrick(Color.Red);
-            Point p = movement.Field.Current.Position;
-
-            Assert.True(movement.Down());
-            Assert.True((p.Y - 1) == movement.Field.Current.Position.Y);
+            for (int i = 0; i < 2; i++)
+            {
+                yield return new object[]
+                {
+                    new List<Item[]>()
+                    {
+                        FillLine(10),
+                        FillLine(10),
+                        FillLine(10),
+                        FillLine(10)
+                    },
+                    i == 0 ? false : true
+                };
+
+                yield return new object[]
+                {
+                    new List<Item[]>()
+                    {
+                    },
+                    i == 0 ? false : true
+                };
+            }
         }
 
-        [Fact]
-        public void CreateMovementWithEmptyFieldAndMoveToEnd_Passing()
+        [Theory]
+        [MemberData(nameof(GetMovementData))]
+        public void CreateMovementAndMoveDownWithDifferentSettings_Passing(List<Item[]> line, bool toEnd)
         {
             Movement movement = factory.CreateMovement(factory.CreateField());
+            movement.Field.Line.AddRange(line);
 
             Assert.NotNull(movement);
             Assert.NotNull(movement.Field);
 
             movement.Field.Current = factory.CreateFieldBrick(Color.Red);
 
-            while (movement.Down());
+            int i = movement.Field.Current.Position.Y;
 
-            Assert.False(movement.Down());
-            Assert.True(0 == movement.Field.Current.Position.Y);
-        }
+            while (movement.Down())
+            {
+                i--;
 
-        [Fact]
-        public void CreateMovementWithFieldAndMoveToEnd_Passing()
-        {
-            Movement movement = factory.CreateMovement(factory.CreateField());
+                if (!toEnd)
+                    break;
+            }
 
-            Assert.NotNull(movement);
-            Assert.NotNull(movement.Field);
-
-            movement.Field.Line.Add(FillLine(factory.Size.Width));
-            movement.Field.Current = factory.CreateFieldBrick(Color.Red);
+            Assert.Equal(toEnd, (movement.Field.Line.Count == i));
+            Assert.Equal(toEnd, (movement.Field.Line.Count == movement.Field.Current.Position.Y));
 
-            while (movement.Down()) ;
+            if (!toEnd)
+                return;
 
             Assert.False(movement.Down());
-            Assert.True(1 == movement.Field.Current.Position.Y);
         }
     }
 }