Merge pull request #33 from MrDave1999/patch-7

test: Use parameterized tests on types such as RankCollection and GtaWeaponsTests
MrDave1999 · Aug 23, 2024 · 85fc381 · 85fc381
2 parents 32a9629 + 10f92c8
commit 85fc381
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 53 deletions.
diff --git a/tests/Application.Tests/Players/Ranks/RankCollectionTests.cs b/tests/Application.Tests/Players/Ranks/RankCollectionTests.cs
@@ -2,8 +2,9 @@
 
 public class RankCollectionTests
 {
-    [TestCase(-1)]
-    [TestCase(1000)]
+    static readonly int[] InvalidRankCases = [-1, 1000, RankCollection.Count];
+
+    [TestCaseSource(nameof(InvalidRankCases))]
     public void GetById_WhenRankIsInvalid_ShouldReturnsFailureResult(int value)
     {
         // Arrange
@@ -18,22 +19,6 @@ public void GetById_WhenRankIsInvalid_ShouldReturnsFailureResult(int value)
         result.Message.Should().Be(expectedMessage);
     }
 
-    [Test]
-    public void GetById_WhenRankIsMax_ShouldReturnsFailureResult()
-    {
-        // Arrange
-        int max = RankCollection.Count;
-        RankId rankId = (RankId)max;
-        string expectedMessage = Messages.InvalidRank;
-
-        // Act
-        Result<IRank> result = RankCollection.GetById(rankId);
-
-        // Asserts
-        result.IsSuccess.Should().BeFalse();
-        result.Message.Should().Be(expectedMessage);
-    }
-
     [Test]
     public void GetById_WhenRankIsValid_ShouldReturnsSuccessResult()
     {
@@ -50,8 +35,7 @@ public void GetById_WhenRankIsValid_ShouldReturnsSuccessResult()
         result.Message.Should().BeEmpty();
     }
 
-    [TestCase(-1)]
-    [TestCase(1000)]
+    [TestCaseSource(nameof(InvalidRankCases))]
     public void GetNextRank_WhenRankIsInvalid_ShouldReturnsFailureResult(int value)
     {
         // Arrange
@@ -66,22 +50,6 @@ public void GetNextRank_WhenRankIsInvalid_ShouldReturnsFailureResult(int value)
         result.Message.Should().Be(expectedMessage);
     }
 
-    [Test]
-    public void GetNextRank_WhenRankIsMax_ShouldReturnsFailureResult()
-    {
-        // Arrange
-        int max = RankCollection.Count;
-        RankId rankId = (RankId)max;
-        string expectedMessage = Messages.InvalidRank;
-
-        // Act
-        Result<IRank> result = RankCollection.GetNextRank(rankId);
-
-        // Asserts
-        result.IsSuccess.Should().BeFalse();
-        result.Message.Should().Be(expectedMessage);
-    }
-
     [Test]
     public void GetNextRank_WhenRankIsValid_ShouldReturnsSuccessResult()
     {

diff --git a/tests/Application.Tests/Players/Weapons/GtaWeaponsTests.cs b/tests/Application.Tests/Players/Weapons/GtaWeaponsTests.cs
@@ -2,6 +2,8 @@
 
 public class GtaWeaponsTests
 {
+    static readonly int[] InvalidWeaponIndexCases = [-1, 1000, GtaWeapons.Count];
+
     [Test]
     public void GetById_WhenWeaponIdIsNotFound_ShouldReturnsFailureResult()
     {
@@ -78,8 +80,7 @@ public void GetByName_WhenWeaponNameIsFound_ShouldReturnsSuccessResult(string we
         result.Value.Id.Should().Be(expectedWeaponId);
     }
 
-    [TestCase(-1)]
-    [TestCase(1000)]
+    [TestCaseSource(nameof(InvalidWeaponIndexCases))]
     public void GetByIndex_WhenIndexIsInvalid_ShouldReturnsFailureResult(int index)
     {
         // Arrange
@@ -93,21 +94,6 @@ public void GetByIndex_WhenIndexIsInvalid_ShouldReturnsFailureResult(int index)
         result.Message.Should().Be(expectedMessage);
     }
 
-    [Test]
-    public void GetByIndex_WhenIndexIsMax_ShouldReturnsFailureResult()
-    {
-        // Arrange
-        int index = GtaWeapons.Count;
-        string expectedMessage = Messages.InvalidWeapon;
-
-        // Act
-        Result<IWeapon> result = GtaWeapons.GetByIndex(index);
-
-        // Asserts
-        result.IsSuccess.Should().BeFalse();
-        result.Message.Should().Be(expectedMessage);
-    }
-
     [Test]
     public void GetByIndex_WhenIndexIsValid_ShouldReturnsSuccessResult()
     {