From fb69b719b4677b346a68fe045dee8bac201c3f1c Mon Sep 17 00:00:00 2001 From: Alexis DRAI Date: Mon, 19 Sep 2022 14:59:03 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Generalize=20from=20HashSets=20to?= =?UTF-8?q?=20IEnumerables=20or=20Collections?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Tests/Model_UTs/PlayerManagerTest.cs | 33 +++++++++----------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/Sources/Tests/Model_UTs/PlayerManagerTest.cs b/Sources/Tests/Model_UTs/PlayerManagerTest.cs index 0e788d0..f3f87dc 100644 --- a/Sources/Tests/Model_UTs/PlayerManagerTest.cs +++ b/Sources/Tests/Model_UTs/PlayerManagerTest.cs @@ -1,29 +1,25 @@ using Model; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; using Xunit; -using Xunit.Sdk; namespace Tests.Model_UTs { public class PlayerManagerTest { [Fact] - public void TestConstructorReturnsEmptyHashSet() + public void TestConstructorReturnsEmptyEnumerable() { // Arrange - PlayerManager playerManager; - HashSet expected; - HashSet actual; + PlayerManager playerManager = new(); + IEnumerable expected; + IEnumerable actual; // Act - playerManager = new(); - expected = new(); - actual = (HashSet)playerManager.GetAll(); + expected = new Collection(); + actual = playerManager.GetAll(); // Assert Assert.Equal(expected, actual); @@ -36,10 +32,10 @@ namespace Tests.Model_UTs PlayerManager playerManager = new(); Player alice = new("Alice"); Player bob = new("Bob"); - HashSet expected = new() { alice, bob }; // Act - HashSet actual = new() + Collection expected = new() { alice, bob }; + Collection actual = new() { playerManager.Add(alice), playerManager.Add(bob) @@ -59,7 +55,7 @@ namespace Tests.Model_UTs // Act expected = null; - actual = playerManager.Add(expected); + actual = playerManager.Add(expected);// Add() returns the added element if succesful // Assert Assert.Equal(expected, actual); @@ -155,11 +151,11 @@ namespace Tests.Model_UTs Player player = new("Dylan"); playerManager.Add(player); Player notPlayer = null; - HashSet expected = new() { player }; + IEnumerable expected = new Collection { player }; // Act playerManager.Remove(notPlayer); - HashSet actual = (HashSet)playerManager.GetAll(); + IEnumerable actual = playerManager.GetAll(); // Assert Assert.Equal(actual, expected); @@ -173,11 +169,11 @@ namespace Tests.Model_UTs Player player = new("Dylan"); playerManager.Add(player); Player notPlayer = new("Eric"); - HashSet expected = new() { player }; + IEnumerable expected = new Collection { player }; // Act playerManager.Remove(notPlayer); - HashSet actual = (HashSet)playerManager.GetAll(); + IEnumerable actual = playerManager.GetAll(); // Assert Assert.Equal(actual, expected); @@ -198,6 +194,7 @@ namespace Tests.Model_UTs // Assert Assert.DoesNotContain(oldPlayer, playerManager.GetAll()); Assert.Contains(newPlayer, playerManager.GetAll()); + Assert.True(playerManager.GetAll().Count() == 1); } [Theory]