diff --git a/source/Trek-12/Models/Game/Player.cs b/source/Trek-12/Models/Game/Player.cs index 990d767..cbc4035 100644 --- a/source/Trek-12/Models/Game/Player.cs +++ b/source/Trek-12/Models/Game/Player.cs @@ -25,4 +25,19 @@ public class Player return Operation.LOWER; } + public override bool Equals(object? obj) + { + if (obj == null || GetType() != obj.GetType()) + { + return false; + } + Player c = (Player)obj; + return (Pseudo == c.Pseudo); + } + + // Redefinition de la méthode de Hash pour l'opérateur == + public override int GetHashCode() + { + return Pseudo.GetHashCode(); + } } \ No newline at end of file diff --git a/source/Trek-12/Tests/CellTest.cs b/source/Trek-12/Tests/CellTest.cs index 3056193..1533bba 100644 --- a/source/Trek-12/Tests/CellTest.cs +++ b/source/Trek-12/Tests/CellTest.cs @@ -7,7 +7,7 @@ public class CellTest public void CellConstructorTest() { Cell cell = new Cell(0, 0); - Assert.Equal(0, cell.X); - Assert.Equal(0,cell.Y); + Assert.Equal(0, cell.Pos.X); + Assert.Equal(0,cell.Pos.Y); } } \ No newline at end of file diff --git a/source/Trek-12/Tests/DeTest.cs b/source/Trek-12/Tests/DeTest.cs index 7c35638..3b77fd5 100644 --- a/source/Trek-12/Tests/DeTest.cs +++ b/source/Trek-12/Tests/DeTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Models; +using Models.Game; namespace Tests; diff --git a/source/Trek-12/Tests/PlayerTest.cs b/source/Trek-12/Tests/PlayerTest.cs index 9d09312..0ff7ed9 100644 --- a/source/Trek-12/Tests/PlayerTest.cs +++ b/source/Trek-12/Tests/PlayerTest.cs @@ -1,5 +1,5 @@ namespace Tests; -using Models; +using Models.Game; public class PlayerTest { @@ -20,7 +20,7 @@ public class PlayerTest public void PlayerIsEqualTest() { Player player = new Player("John"); - Player player2 = new Player("John","DefaultProfilePicture"); + Player player2 = new Player("John", "DefaultProfilePicture"); Player player3 = new Player("Inconnu","N/A"); Assert.Equal(player, player2);