From f0a3185b4b34dfda83665095898f9c770281ae3c Mon Sep 17 00:00:00 2001 From: "jules.lascret" Date: Fri, 7 Jun 2024 18:21:06 +0200 Subject: [PATCH] Test issue #2 --- Qwirkle/QwirkleClassLibrary/Games/Game.cs | 2 +- Qwirkle/TestBase/TestGame.cs | 64 +++++++++++++++-------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/Qwirkle/QwirkleClassLibrary/Games/Game.cs b/Qwirkle/QwirkleClassLibrary/Games/Game.cs index d5e8d19..caca023 100644 --- a/Qwirkle/QwirkleClassLibrary/Games/Game.cs +++ b/Qwirkle/QwirkleClassLibrary/Games/Game.cs @@ -558,7 +558,7 @@ namespace QwirkleClassLibrary.Games /// /// /// - public bool CheckTileInCompletedLines(Tile? t1, ref int nbTiles, ref List checkdoubles) + public static bool CheckTileInCompletedLines(Tile? t1, ref int nbTiles, ref List checkdoubles) { if (t1! != null!) { diff --git a/Qwirkle/TestBase/TestGame.cs b/Qwirkle/TestBase/TestGame.cs index 6c5637a..e09f068 100644 --- a/Qwirkle/TestBase/TestGame.cs +++ b/Qwirkle/TestBase/TestGame.cs @@ -287,25 +287,6 @@ public class TestGame Assert.False(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], -5, 1)); } - // [Fact] - // public void Test_DrawTile() - // { - // Game game = new Game(); - // game.AddPlayerInGame("Test1"); - // game.AddPlayerInGame(playerstest); - // - // game.StartGame(); - // game.SetNextPlayer(); - // - // Assert.True(game.DrawTiles(game.GetPlayingPlayer())); - // - // /*test*/ - // TileBag bag = new TileBag(0); - // Assert.False(game.DrawTiles(game.GetPlayingPlayer())); - // return; - // - // } - [Theory] [InlineData(true)] [InlineData(false)] @@ -342,6 +323,48 @@ public class TestGame Assert.Equal(p, events.Player); } + [Fact] + public void Test_IsTilePlacementCorrect() + { + var game = new Game(); + var board = new Board(17, 14); + var tile = new Tile(Shape.Club, Color.Red); + + board.AddTileInCell(0, 1, new Tile(Shape.Club, Color.Blue)); + + var x = 1; + var y = 1; + + var surroundingCells = new List + { + board.GetCell(x + 1, y), + board.GetCell(x - 1, y), + board.GetCell(x, y + 1), + board.GetCell(x, y - 1) + }; + + bool result = game.IsTilePlacementCorrect(tile, x, y, board, surroundingCells); + + Assert.True(result); + } + + [Fact] + public void Test_IsMoveCorrect() + { + var game = new Game(); + var board = new Board(17, 14); + var tile = new Tile(Shape.Club, Color.Red); + + board.AddTileInCell(0, 1, new Tile(Shape.Club, Color.Blue)); + + var x = 2; + var y = 1; + + bool result = game.IsMoveCorrect(tile, x, y, board); + + Assert.False(result); + } + [Fact] public void Test_IsMoveCorrectSixLine() { @@ -384,7 +407,6 @@ public class TestGame [Fact] public void Test_CheckTileInCompletedLines() { - var game = new Game(); int nbTiles = 0; var checkdoubles = new List() { @@ -395,7 +417,7 @@ public class TestGame var t1 = new Tile(Shape.Club, Color.Green); - Assert.False(game.CheckTileInCompletedLines(t1, ref nbTiles, ref checkdoubles)); + Assert.False(Game.CheckTileInCompletedLines(t1, ref nbTiles, ref checkdoubles)); } [Fact]