Merge pull request #2 from VisualStudioEX3/feature/refactor-tests

Feature/refactor tests

Author: José Miguel Sánchez Fernández

DIV2.Format.Exporter.Tests/DIV2.Format.Exporter.Tests.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20210127-04" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.0-preview-20210115-03" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.0-preview-20210115-03" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
   </ItemGroup>
 
   <ItemGroup>

DIV2.Format.Exporter.Tests/Tests/ColorRangeTableTests.cs

@@ -63,7 +63,6 @@ public void AreEqual()
         public void AreNotEqual()
         {
             var a = new ColorRangeTable();
-            
             var b = new ColorRangeTable();
             byte startIndex = 64;
             for (int i = 0; i < ColorRangeTable.LENGTH; i++)

DIV2.Format.Exporter.Tests/Tests/ColorTests.cs

@@ -97,16 +97,9 @@ public void WriteByIndex()
         [TestMethod]
         public void FailWriteByIndex()
         {
-            Assert.ThrowsException<IndexOutOfRangeException>(() =>
-            {
-                var color = new Color();
-                color[-1] = 0;
-            });
-            Assert.ThrowsException<IndexOutOfRangeException>(() =>
-            {
-                var color = new Color();
-                color[Color.LENGTH + 1] = 0;
-            });
+            var color = new Color();
+            Assert.ThrowsException<IndexOutOfRangeException>(() => color[-1] = 0);
+            Assert.ThrowsException<IndexOutOfRangeException>(() => color[Color.LENGTH + 1] = 0);
         }
 
         [TestMethod]

DIV2.Format.Exporter.Tests/Tests/FPGTests.cs

@@ -259,6 +259,7 @@ public void AddMapWithTheSamePalette()
         public void AddMapWithDifferentPalette()
         {
             const string PLAYER_MAP_FILENAME_FIELD = "PLAYER.MAP";
+
             string playerMapPath = this.GetAssetPath(SharedConstants.FILENAME_IMG_PLAYER_MAP);
 
             var pal = new PAL(this.GetAssetPath(SharedConstants.FILENAME_PAL_DIV));
@@ -325,6 +326,7 @@ public void FailContainsMap()
         public void RemoveMapByGraphId()
         {
             const int GRAPH_ID = 100; // PLAYER.MAP, index 1.
+
             var fpg = new FPG(this.GetAssetPath(SharedConstants.FILENAME_FPG_TEST));
 
             fpg.Remove(GRAPH_ID);
@@ -392,6 +394,7 @@ public void RemoveMapByIndex()
         {
             const int GRAPH_ID = 100; // PLAYER.MAP, index 1.
             const int INDEX = 1;
+
             var fpg = new FPG(this.GetAssetPath(SharedConstants.FILENAME_FPG_TEST));
 
             fpg.RemoveAt(INDEX);
@@ -403,6 +406,7 @@ public void RemoveMapByIndex()
         public void FailRemoveMapByIndex()
         {
             var fpg = new FPG(this.GetAssetPath(SharedConstants.FILENAME_FPG_TEST));
+
             Assert.ThrowsException<IndexOutOfRangeException>(() => fpg.RemoveAt(-1));
             Assert.ThrowsException<IndexOutOfRangeException>(() => fpg.RemoveAt(fpg.Count + 1));
         }
@@ -412,6 +416,7 @@ public void FailRemoveMapByIndexWhenFPGIsEmpty()
         {
             var pal = new PAL(this.GetAssetPath(SharedConstants.FILENAME_PAL_SPACE));
             var fpg = new FPG(pal);
+
             Assert.ThrowsException<InvalidOperationException>(() => fpg.Remove(0));
         }
 

DIV2.Format.Exporter.Tests/Tests/MAPTests.cs

@@ -160,6 +160,7 @@ public void AreEqual()
         {
             var a = new MAP(this._palette, TEST_WIDTH, TEST_HEIGHT);
             var b = new MAP(this._palette, TEST_WIDTH, TEST_HEIGHT);
+
             Assert.AreEqual(a, b);
         }
 
@@ -168,6 +169,7 @@ public void AreNotEqual()
         {
             var a = new MAP(this._palette, TEST_WIDTH, TEST_HEIGHT);
             var b = new MAP(this._palette, TEST_WIDTH, TEST_HEIGHT, MAP.MIN_GRAPH_ID, TEST_DESCRIPTION);
+
             Assert.AreNotEqual(a, b);
         }
 
@@ -245,9 +247,10 @@ public void FailReadByCoordinates()
         [TestMethod]
         public void WriteByCoordinates()
         {
-            this.CreateTestMap(out byte[] bitmap);
             var map = new MAP(this._palette, TEST_WIDTH, TEST_HEIGHT);
 
+            this.CreateTestMap(out byte[] bitmap);
+
             for (int y = 0; y < TEST_HEIGHT; y++)
                 for (int x = 0; x < TEST_WIDTH; x++)
                     map[x, y] = bitmap[this.GetIndex(x, y)];
@@ -371,6 +374,7 @@ public void Save()
         {
             string assetPath = this.GetOutputPath("TEST.MAP");
             this.CreateTestMap(out _).Save(assetPath);
+
             Assert.IsTrue(MAP.ValidateFormat(assetPath));
         }