From 34bcd34884577b611c00bd6195a5bbddce93ea0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Mouyon?= <jeremy.mouyon@etu.uca.fr>
Date: Wed, 22 May 2024 10:29:05 +0200
Subject: [PATCH 01/10] Supprimer 'Qwirkle/cm7/cm7.cs'

---
 Qwirkle/cm7/cm7.cs | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 Qwirkle/cm7/cm7.cs

diff --git a/Qwirkle/cm7/cm7.cs b/Qwirkle/cm7/cm7.cs
deleted file mode 100644
index 21194e3..0000000
--- a/Qwirkle/cm7/cm7.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// DataBinding Baby !!
-
-// Applcation se basant sur le site wtatennis.com
-
-// class : Player, Place (Birth Places), Manager, IPersistanceManager
-// enum : Hand (lfet-handed or right-handed)
-
-// Player.cs
-
-public string FirstName
-{
-    get => firstName;
-    set
-    {
-        if(value == firstName) return;
-        firstName = value;
-        OnPropertyChanged();
-    }
-}
-
-private string firstName;
-
-public event PropertyChangedEventHandler PropertyChanged;
-
-public void OnPropertyChanged([CallerMemberName] string propertyName = null)
-{
-    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-}
\ No newline at end of file

From 52f95f7cb8ffce3305163e6133f69cbe5669ad62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Mouyon?= <jeremy.mouyon@etu.uca.fr>
Date: Wed, 22 May 2024 10:29:09 +0200
Subject: [PATCH 02/10] Supprimer 'Qwirkle/cm7/cm7.xaml'

---
 Qwirkle/cm7/cm7.xaml | 41 -----------------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 Qwirkle/cm7/cm7.xaml

diff --git a/Qwirkle/cm7/cm7.xaml b/Qwirkle/cm7/cm7.xaml
deleted file mode 100644
index 3ef2d31..0000000
--- a/Qwirkle/cm7/cm7.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- Player Page -->
-
-<Grid ColumnDefinition="*, *" RowDefinition="Auto, *">
-    <Grid BackgroundColor="Blue">
-        <VerticalStackLayout>
-            <Label Text="Ranking"/>
-            <Label Text="{Binding Rank}"/>
-            <Label Text="Singles"/>
-        </VerticalStackLayout>
-    </Grid>
-    <Grid BackgroundColor="Blue" Grid.Column="1">
-        <VerticalStackLayout>
-            <Entry Text="{Binding Player.FirstName, Mode=OneWayToSource}"/> 
-            <Label Text="{Binding Player.FirstName}, Mode=(OneWay, TwoWay, OneWayToSource)"/> <!-- Automatically subscribed to the source's property change -->
-            <Label Text="{Binding Player.LastName}"/>
-            <Label Text="{Binding Player.Height, StringFormat=\{0\}m}"/>
-            <Button Text="=>" Clicked="ButtonClicked"/>
-        </VerticalStackLayout>
-    </Grid>
-    <Image Grid.RowSpan="2" Source="{Binding Player.ImageLarge}"/>
-</Grid>
-
-<!-- =================== -->
-
-<!-- Players Page -->
-
-<ListView ItemsSource="{Binding Players}">
-    <ListView.ItemTemplate>
-        <DataTemplate>
-            <ViewCell>
-                <HorizontalStackLayout>
-                    <Label Text="{Binding FirstName}"/>
-                    <Label Text="{Binding LastName}"/>
-                    <Label Text="{Binding Points}"/>
-                </HorizontalStackLayout>
-            </ViewCell>
-        </DataTemplate>
-    </ListView.ItemTemplate>
-</ListView>
-
-<!-- =================== -->
\ No newline at end of file

From bd9aad6ccbe9b3fc007508e447ad4abd14935f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Mouyon?= <jeremy.mouyon@etu.uca.fr>
Date: Wed, 22 May 2024 10:29:12 +0200
Subject: [PATCH 03/10] Supprimer 'Qwirkle/cm7/cm7_codebehind.cs'

---
 Qwirkle/cm7/cm7_codebehind.cs | 80 -----------------------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 Qwirkle/cm7/cm7_codebehind.cs

diff --git a/Qwirkle/cm7/cm7_codebehind.cs b/Qwirkle/cm7/cm7_codebehind.cs
deleted file mode 100644
index d69013d..0000000
--- a/Qwirkle/cm7/cm7_codebehind.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Code Behind for PlayerPage
-
-public partial class PlayerPage : ContentPage
-{
-    public Manager Mgr { get; set; } = new Manager(new Stub());
-
-    public int PlayerIndex { get; set; } = 0;
-
-    public RankedPlayer RankedPlayer { get; set; }
-
-    public PlayerPage()
-    {
-        Mgr.LoadPlayers();
-
-        InitializeComponent();
-
-        RankedPlayer = new RankedPlayer(Mgr.Players.ElementAt(2), Mgr);
-        BindingContext = RankedPlayer;
-    }
-
-    public void ButtonClicked(object sender, EventArgs e)
-    {
-        PlayerIndex++;
-        RankedPlayer.Player = Mgr.Players.ElementAt(PlayerIndex); // Source's property changed, not the source itself
-    }
-}
-
-public class RankedPlayer : INotifyPropertyChanged
-{
-    public RankedPlayer(Player player, Manager mgr)
-    {
-        Mgr = mgr;
-        Player = player;
-    }
-
-    private Manager Mgr { get; set; }
-
-    public Player thePlayer
-    {
-        get => thePlayer;
-        set
-        {
-            if(value == thePlayer) return;
-            thePlayer = value;
-            OnPropertyChanged("ThePlayer");
-            OnPropertyChanged(nameof(Rank));
-        }
-    }
-
-    private Player thePlayer;
-
-    public int Rank => Mgr.Players.OrderingByDescending(p => p.Points).ToList().IndexOf(Player) + 1;
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    public void OnPropertyChanged(string propertyName)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
-}
-
-// ===============================
-
-// Code behind for Players Page
-
-public partial class PlayersPage : ContentPage
-{
-    public Manager Mgr { get; set; } = new Manager(new Stub());
-
-    public PlayersPage()
-    {
-        Mgr.LoadPlayers();
-
-        InitializeComponent();
-
-        BindingContext = Mgr;
-    }
-}
-
-// ===============================
\ No newline at end of file

From 95039ecb306dd68beda5f48be6726cbedaed8796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Mouyon?= <jeremy.mouyon@etu.uca.fr>
Date: Wed, 22 May 2024 10:29:17 +0200
Subject: [PATCH 04/10] Supprimer 'Qwirkle/cm4.cs'

---
 Qwirkle/cm4.cs | 162 -------------------------------------------------
 1 file changed, 162 deletions(-)
 delete mode 100644 Qwirkle/cm4.cs

diff --git a/Qwirkle/cm4.cs b/Qwirkle/cm4.cs
deleted file mode 100644
index 87a68a5..0000000
--- a/Qwirkle/cm4.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-// Pas de console.WriteLine() dans les classes
-
-// Mot clé abstract dans la déclaration de la méthode et la déclaration de la classe pour faire une méthode virtuelle pure et une classe abstraite
-//      => ON utilise pas normalement
-
-using panier;
-
-namespace Animaux // Héritage
-{
-    public class Animal
-    {
-        public string Name {get; private set;}
-
-        public Animal(string name)
-        {
-            this.Name = name;
-        }
-
-        public virtual string Crie()
-        {
-            return "GRR";
-        }
-    }
-
-    public class Chien : Animal
-    {
-        public Chien(string name) : base(name) {}
-
-        public override string Crie()
-        {
-            return $"{base.Crie()} + Wouf";
-        }
-    }
-}
-
-
-namespace panier // Interfaces
-{
-    public class Article : IEqualTable<Article>
-    {
-        public string Name { get; set; }
-        public float Price { get; set; }
-
-        public Article(string name, float price)
-        {
-            Name = name;
-            Price = price;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            if(ReferenceEquals(obj, null)) return false;
-            if(ReferenceEquals(obj, this)) return true;
-            if(obj.GetType() != typeof(Article)) return false;
-            return Equals(obj as Article);
-        }
-
-        public bool Equals(Article? other)
-        {
-            return other.Name.Equals(Name);
-        }
-
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-    }
-
-    public class PanierDAchat
-    {
-
-        /*
-            1) Créer une collection privée readonly
-            2) Créer une ReadOnlyCollection public avec un set privé
-            3) On l'initialise dans le constructeur
-        */
-
-        public ReadOnlyCollection<Article> Articles { get; private set; };
-        private List<Article> Articles = new List<Article>();
-
-        public ICalculPromo Promo {get; private set; }
-
-        public float TotalPrice()
-        {
-            return Promo.GetTotal(this);
-        }
-
-        public void AddArticle(Article article)
-        {
-            if(!Articles.Contains(article))
-            {
-                Articles.Add(article);
-            }
-        }
-    }
-
-    public interface ICalculPromo
-    {
-        float GetTotal(PanierDAchat panier);
-    }
-
-    public class SansPromotion : ICalculPromo
-    {
-        public float GetTotal(PanierDAchat panier)
-        {
-            return panier.Articles.Sum(a => a.Price);
-        }
-    }
-
-    public class SansTVA : ICalculPromo
-    {
-        public float GetTotal(PanierDAchat panier)
-        {
-            return panier.Articles.Sum(a => a.Price) * 0.8f;
-        }
-    }
-
-    public class TroisPourLePrixDeDeux : ICalculPromo
-    {
-        public float GetTotal(PanierDAchat panier)
-        {
-            var sortedArticles = panier.Articles.OrderByDescending(a => a.Price);
-            int count = sortedArticles.count();
-            sortedArticles.take((int)(count / 3) * 3).Sum(a => a.Price);
-        }
-    }
-}
-
-
-PanierDAchat p = new PanierDAchat();
-
-p.Promo = new SansPromotion();
-p.Promo = new SansTVA();
-
-
-
-namespace TestUnitairePanier
-{
-    public class UnitTest1
-    {
-        [Fact]
-        public void Test_AddArticle()
-        {
-            PanierDAchat p = new PanierDAchat();
-            bool result = p.AddArticle(new Article("Jp", 0.4))
-            Assert.True(result);
-        }
-    }
-
-    public class UnitTest2
-    {
-        [Theory]
-        [InlineData(true, "Jp", 0.5)]
-        [InlineData(false, "Jp", -0.5)]
-        public void Test_AddArticle(bool expectedResult, string name, float price)
-        {
-            PanierDAchat p = new PanierDAchat();
-            bool result = p.AddArticle(new Article("Jp", 0.4))
-            Assert.True(result);
-        }
-    }
-}
\ No newline at end of file

From c4eb8c2c39b0cbe67e434216859daef230a78055 Mon Sep 17 00:00:00 2001
From: Remy PORTET <remy.portet@etu.uca.fr>
Date: Wed, 22 May 2024 17:41:07 +0200
Subject: [PATCH 05/10] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'README.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 982b704..c795e4a 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Après cela, vous pourrez continuer à placer d'autres tuiles, si vous le souhai
 
 #### **Echanger ses tuiles**
 
-Si vous souhaitez échanger des des tuiles de votre main, vous pouvez choisir de les échanger avec des tuiles de la pioche. Entrez simplement les numéros correspondants des tuiles que vous voulez échanger?
+Si vous souhaitez échanger des des tuiles de votre main, vous pouvez choisir de les échanger avec des tuiles de la pioche. Entrez simplement les numéros correspondants des tuiles que vous voulez échanger.
 Attention, gardez à l'esprit que si vous choisissez cette option, vous ne pourrez pas jouer durant ce tour.
 
 ### Et voilà !

From eb9cc8a445073a203233ffaa71665d0b87f32558 Mon Sep 17 00:00:00 2001
From: "jules.lascret" <jules.lascret@etu.uca.fr>
Date: Wed, 22 May 2024 17:48:22 +0200
Subject: [PATCH 06/10] Added Test for the GetPlayerScore method

---
 Qwirkle/TestBase/TestGame.cs | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/Qwirkle/TestBase/TestGame.cs b/Qwirkle/TestBase/TestGame.cs
index 8558e4a..443f929 100644
--- a/Qwirkle/TestBase/TestGame.cs
+++ b/Qwirkle/TestBase/TestGame.cs
@@ -341,6 +341,39 @@ public class TestGame
 
     }
 
+    [Theory]
+    [InlineData(3, 1, 4, 1, 5, 1, 5)]
+    [InlineData(2, 2, 3, 2, 4, 2, 5)]
+    [InlineData(3, 1, 3, 2, 3, 3, 6)]
+    public void GetPlayerScore_ReturnsCorrectScore(int x1, int y1, int x2, int y2, int x3, int y3, int expectedScore)
+    {
+        var game = new Game();
+        var player = new Player("TestPlayer");
+        var board = new Board(8, 8);
+        
+        board.AddTileInCell(1, 1, new Tile(Shape.Club, Color.Red));
+        board.AddTileInCell(2, 1, new Tile(Shape.Square, Color.Red));
+        
+        var c1 = new Cell(x1, y1);
+        var c2 = new Cell(x2, y2);
+        var c3 = new Cell(x3, y3);
+
+        c1.SetTile(new Tile(Shape.Club, Color.Red));
+        c2.SetTile(new Tile(Shape.Square, Color.Red));
+        c3.SetTile(new Tile(Shape.Star, Color.Red));
+
+        var cellsPlayed = new List<Cell>
+        {
+            c1,
+            c2,
+            c3
+        }.AsReadOnly();
+
+        var score = game.GetPlayerScore(player, cellsPlayed, board);
+
+        Assert.Equal(expectedScore, score);
+    }
+    
     [Fact]
     public void Test_EndOfGame()
     {

From 232c3b2feef0b07aa21c2bbdff95167017b17592 Mon Sep 17 00:00:00 2001
From: "jules.lascret" <jules.lascret@etu.uca.fr>
Date: Wed, 22 May 2024 18:39:00 +0200
Subject: [PATCH 07/10] Added a ClearGame() method + moved the tile bag
 creation to StartGame()

---
 Qwirkle/QwirkleClassLibrary/Games/Game.cs | 35 +++++++++++++++++------
 Qwirkle/TestBase/TestGame.cs              | 23 ++++++++++++---
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/Qwirkle/QwirkleClassLibrary/Games/Game.cs b/Qwirkle/QwirkleClassLibrary/Games/Game.cs
index a3e2711..ab0da75 100644
--- a/Qwirkle/QwirkleClassLibrary/Games/Game.cs
+++ b/Qwirkle/QwirkleClassLibrary/Games/Game.cs
@@ -21,7 +21,7 @@ namespace QwirkleClassLibrary.Games
         public ReadOnlyDictionary<Player, int> ScoreBoard => scoreBoard.AsReadOnly();
         private readonly Dictionary<Player, int> scoreBoard = new();
 
-        private TileBag bag;
+        private TileBag? bag = null;
         public bool GameRunning { get; private set; }
         private Board board;
 
@@ -56,7 +56,6 @@ namespace QwirkleClassLibrary.Games
         /// </summary>
         public Game()
         {
-            bag = CreateTileBag(3);
             board = CreateBoard();
         }
         
@@ -120,6 +119,12 @@ namespace QwirkleClassLibrary.Games
         /// </summary>
         /// <returns>Board</returns>
         public Board GetBoard() { return board; }
+        
+        /// <summary>
+        /// Returns the tile bag of the game
+        /// </summary>
+        /// <returns></returns>
+        public TileBag GetTileBag() { return bag; }
 
         /// <summary>
         /// Creates a board with a number of columns and rows
@@ -148,6 +153,7 @@ namespace QwirkleClassLibrary.Games
         public void StartGame()
         {
             if (players.Count < 2 || players.Count >= 5) return;
+            bag = CreateTileBag(3);
             GameRunning = true;
         }
 
@@ -177,7 +183,7 @@ namespace QwirkleClassLibrary.Games
         {
             if (GetPlayingPlayerPosition() == -1)
             {
-                throw new ArgumentException("No player play.");
+                throw new ArgumentException("No player currently playing !");
             }
             return players[GetPlayingPlayerPosition()];
         }
@@ -217,10 +223,13 @@ namespace QwirkleClassLibrary.Games
             {
                 for (int j = 0; j < 6; j++)
                 {
-                    int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
+                    if (bag != null)
+                    {
+                        int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
 
-                    p.AddTileToPlayer(bag.TilesBag[val]);
-                    bag.RemoveTileInBag(bag.TilesBag[val]);
+                        p.AddTileToPlayer(bag.TilesBag[val]);
+                        bag.RemoveTileInBag(bag.TilesBag[val]);
+                    }
                 }
             }
         }
@@ -650,7 +659,7 @@ namespace QwirkleClassLibrary.Games
         /// </summary>
         /// <param name="playerTilesBagPos"></param>
         /// <returns></returns>
-        public bool CheckBoardTile(List<int> playerTilesBagPos)
+        public bool CheckPlacementPossibilities(List<int> playerTilesBagPos)
         {
             for (int i = 0; i < playerTilesBagPos.Count; i++)
             {
@@ -682,7 +691,7 @@ namespace QwirkleClassLibrary.Games
         {
             List<int> playerTilesBagPos = CheckTilesBag();
 
-            if (playerTilesBagPos.Count != 0 && !CheckBoardTile(playerTilesBagPos))
+            if (playerTilesBagPos.Count != 0 && !CheckPlacementPossibilities(playerTilesBagPos))
             {
                 OnEndOfGame(new EndOfGameNotifiedEventArgs(player));
                 GameRunning = false;
@@ -692,5 +701,15 @@ namespace QwirkleClassLibrary.Games
 
             return false;
         }
+
+        public void ClearGame()
+        {
+            players.Clear();
+            scoreBoard.Clear();
+            cellUsed.Clear();
+            bag = null;
+            board = CreateBoard();
+            GameRunning = false;
+        }
     }
 }
\ No newline at end of file
diff --git a/Qwirkle/TestBase/TestGame.cs b/Qwirkle/TestBase/TestGame.cs
index 443f929..27707ae 100644
--- a/Qwirkle/TestBase/TestGame.cs
+++ b/Qwirkle/TestBase/TestGame.cs
@@ -214,21 +214,19 @@ public class TestGame
         game.AddPlayerInGame("Test1");
         game.AddPlayerInGame("Test2");
 
-        game.GiveTilesToPlayers();
-
         if (except)
         {
             game.StartGame();
+            game.GiveTilesToPlayers();
             game.SetNextPlayer();
             Assert.True(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], 1, 1));
             return;
         }
 
         game.StartGame();
+        game.GiveTilesToPlayers();
         game.SetNextPlayer();
         Assert.False(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], -5, 1));
-        return;
-
     }
 
     [Fact]
@@ -387,6 +385,23 @@ public class TestGame
         game.CheckGameOver(game.GetPlayingPlayer());
         
     }
+    
+    [Fact]
+    public void Test_ClearGame()
+    {
+        Game game = new Game();
+        game.AddPlayerInGame("Test1");
+        game.AddPlayerInGame("Test2");
+
+        game.StartGame();
+        game.SetFirstPlayer();
+
+        game.ClearGame();
+        
+        Assert.Empty(game.PlayerList);
+        Assert.Null(game.GetTileBag());
+        Assert.Equal(-1, game.GetPlayingPlayerPosition());
+    }
 
 }
 

From dc7eaf6c65768a41f3e9031fccf38a0e2a481203 Mon Sep 17 00:00:00 2001
From: rportet <remy@portet.org>
Date: Wed, 22 May 2024 18:55:25 +0200
Subject: [PATCH 08/10] changing the test for DrawTile

---
 Qwirkle/TestBase/TestGame.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Qwirkle/TestBase/TestGame.cs b/Qwirkle/TestBase/TestGame.cs
index 443f929..98bd724 100644
--- a/Qwirkle/TestBase/TestGame.cs
+++ b/Qwirkle/TestBase/TestGame.cs
@@ -241,8 +241,10 @@ public class TestGame
         game.StartGame();
         game.SetNextPlayer();
 
-
         Assert.True(game.DrawTiles(game.GetPlayingPlayer()));
+        
+        TileBag bag = new TileBag(0);
+        Assert.False(game.DrawTiles(game.GetPlayingPlayer()));
         return;
 
     }

From d60308b275277efac5933d2931c706d2d971ee83 Mon Sep 17 00:00:00 2001
From: rportet <remy@portet.org>
Date: Wed, 22 May 2024 19:03:00 +0200
Subject: [PATCH 09/10] test of drawTile

---
 Qwirkle/TestBase/TestGame.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Qwirkle/TestBase/TestGame.cs b/Qwirkle/TestBase/TestGame.cs
index 5460711..12b2a2d 100644
--- a/Qwirkle/TestBase/TestGame.cs
+++ b/Qwirkle/TestBase/TestGame.cs
@@ -240,7 +240,8 @@ public class TestGame
         game.SetNextPlayer();
 
         Assert.True(game.DrawTiles(game.GetPlayingPlayer()));
-        
+
+        /*test*/
         TileBag bag = new TileBag(0);
         Assert.False(game.DrawTiles(game.GetPlayingPlayer()));
         return;

From 916d81e04647abae20200dc6b113bde18d50e7ac Mon Sep 17 00:00:00 2001
From: Jules LASCRET <jules.lascret@etu.uca.fr>
Date: Wed, 22 May 2024 19:16:27 +0200
Subject: [PATCH 10/10] revert 232c3b2feef0b07aa21c2bbdff95167017b17592

revert Added a ClearGame() method + moved the tile bag creation to StartGame()
---
 Qwirkle/QwirkleClassLibrary/Games/Game.cs | 35 ++++++-----------------
 Qwirkle/TestBase/TestGame.cs              | 23 +++------------
 2 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/Qwirkle/QwirkleClassLibrary/Games/Game.cs b/Qwirkle/QwirkleClassLibrary/Games/Game.cs
index ab0da75..a3e2711 100644
--- a/Qwirkle/QwirkleClassLibrary/Games/Game.cs
+++ b/Qwirkle/QwirkleClassLibrary/Games/Game.cs
@@ -21,7 +21,7 @@ namespace QwirkleClassLibrary.Games
         public ReadOnlyDictionary<Player, int> ScoreBoard => scoreBoard.AsReadOnly();
         private readonly Dictionary<Player, int> scoreBoard = new();
 
-        private TileBag? bag = null;
+        private TileBag bag;
         public bool GameRunning { get; private set; }
         private Board board;
 
@@ -56,6 +56,7 @@ namespace QwirkleClassLibrary.Games
         /// </summary>
         public Game()
         {
+            bag = CreateTileBag(3);
             board = CreateBoard();
         }
         
@@ -119,12 +120,6 @@ namespace QwirkleClassLibrary.Games
         /// </summary>
         /// <returns>Board</returns>
         public Board GetBoard() { return board; }
-        
-        /// <summary>
-        /// Returns the tile bag of the game
-        /// </summary>
-        /// <returns></returns>
-        public TileBag GetTileBag() { return bag; }
 
         /// <summary>
         /// Creates a board with a number of columns and rows
@@ -153,7 +148,6 @@ namespace QwirkleClassLibrary.Games
         public void StartGame()
         {
             if (players.Count < 2 || players.Count >= 5) return;
-            bag = CreateTileBag(3);
             GameRunning = true;
         }
 
@@ -183,7 +177,7 @@ namespace QwirkleClassLibrary.Games
         {
             if (GetPlayingPlayerPosition() == -1)
             {
-                throw new ArgumentException("No player currently playing !");
+                throw new ArgumentException("No player play.");
             }
             return players[GetPlayingPlayerPosition()];
         }
@@ -223,13 +217,10 @@ namespace QwirkleClassLibrary.Games
             {
                 for (int j = 0; j < 6; j++)
                 {
-                    if (bag != null)
-                    {
-                        int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
+                    int val = RandomNumberGenerator.GetInt32(0, bag.TilesBag.Count);
 
-                        p.AddTileToPlayer(bag.TilesBag[val]);
-                        bag.RemoveTileInBag(bag.TilesBag[val]);
-                    }
+                    p.AddTileToPlayer(bag.TilesBag[val]);
+                    bag.RemoveTileInBag(bag.TilesBag[val]);
                 }
             }
         }
@@ -659,7 +650,7 @@ namespace QwirkleClassLibrary.Games
         /// </summary>
         /// <param name="playerTilesBagPos"></param>
         /// <returns></returns>
-        public bool CheckPlacementPossibilities(List<int> playerTilesBagPos)
+        public bool CheckBoardTile(List<int> playerTilesBagPos)
         {
             for (int i = 0; i < playerTilesBagPos.Count; i++)
             {
@@ -691,7 +682,7 @@ namespace QwirkleClassLibrary.Games
         {
             List<int> playerTilesBagPos = CheckTilesBag();
 
-            if (playerTilesBagPos.Count != 0 && !CheckPlacementPossibilities(playerTilesBagPos))
+            if (playerTilesBagPos.Count != 0 && !CheckBoardTile(playerTilesBagPos))
             {
                 OnEndOfGame(new EndOfGameNotifiedEventArgs(player));
                 GameRunning = false;
@@ -701,15 +692,5 @@ namespace QwirkleClassLibrary.Games
 
             return false;
         }
-
-        public void ClearGame()
-        {
-            players.Clear();
-            scoreBoard.Clear();
-            cellUsed.Clear();
-            bag = null;
-            board = CreateBoard();
-            GameRunning = false;
-        }
     }
 }
\ No newline at end of file
diff --git a/Qwirkle/TestBase/TestGame.cs b/Qwirkle/TestBase/TestGame.cs
index 12b2a2d..d205135 100644
--- a/Qwirkle/TestBase/TestGame.cs
+++ b/Qwirkle/TestBase/TestGame.cs
@@ -214,19 +214,21 @@ public class TestGame
         game.AddPlayerInGame("Test1");
         game.AddPlayerInGame("Test2");
 
+        game.GiveTilesToPlayers();
+
         if (except)
         {
             game.StartGame();
-            game.GiveTilesToPlayers();
             game.SetNextPlayer();
             Assert.True(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], 1, 1));
             return;
         }
 
         game.StartGame();
-        game.GiveTilesToPlayers();
         game.SetNextPlayer();
         Assert.False(game.PlaceTile(game.GetPlayingPlayer(), game.PlayerList[game.GetPlayingPlayerPosition()].Tiles[0], -5, 1));
+        return;
+
     }
 
     [Fact]
@@ -388,23 +390,6 @@ public class TestGame
         game.CheckGameOver(game.GetPlayingPlayer());
         
     }
-    
-    [Fact]
-    public void Test_ClearGame()
-    {
-        Game game = new Game();
-        game.AddPlayerInGame("Test1");
-        game.AddPlayerInGame("Test2");
-
-        game.StartGame();
-        game.SetFirstPlayer();
-
-        game.ClearGame();
-        
-        Assert.Empty(game.PlayerList);
-        Assert.Null(game.GetTileBag());
-        Assert.Equal(-1, game.GetPlayingPlayerPosition());
-    }
 
 }