From e3f999276fecfa621619d25cf49d506fb2f9d07e Mon Sep 17 00:00:00 2001
From: "najlae.lambaraa" <najlae.lambaraa@etu.uca.fr>
Date: Tue, 11 Oct 2022 11:59:41 +0200
Subject: [PATCH] :wrench:  UT_Game

---
 Sources/MaSoluction/Model/Game.cs             | 39 ++++++++++---------
 Sources/MaSoluction/Model/NumberDie.cs        | 14 +++----
 Sources/MaSoluction/Testeur/TesterStub.cs     |  4 +-
 .../{UnitTest1.cs => UT_ConstructeurGame.cs}  |  2 +-
 Sources/MaSoluction/Testeur/UT_NumberDice.cs  |  8 ++--
 5 files changed, 35 insertions(+), 32 deletions(-)
 rename Sources/MaSoluction/Testeur/{UnitTest1.cs => UT_ConstructeurGame.cs} (82%)

diff --git a/Sources/MaSoluction/Model/Game.cs b/Sources/MaSoluction/Model/Game.cs
index 81d3414..af01874 100644
--- a/Sources/MaSoluction/Model/Game.cs
+++ b/Sources/MaSoluction/Model/Game.cs
@@ -13,23 +13,23 @@ namespace Model
 
 
 
-        private List<Die> listDice = new List<Die>(); //encapsulation des collections voir les videos partie 2
-        public ReadOnlyCollection<Die> ListDice { get; set; }
-
-
-        public Game(string name, List<Die> listDice)
+        
+        public ReadOnlyCollection<NumberDie> ListDice { get; set; }
+        private List<NumberDie> listDice = new List<NumberDie>(); //encapsulation des collections voir les videos partie 2
+        public Game(string name, List<NumberDie> listDice)
         {
             Name = name;
+            this.listDice.AddRange(listDice);
 
-
-
-
+            ListDice=new ReadOnlyCollection<NumberDie>(this.listDice);
         }
 
-        public Game(string name, params Die[] numberDie1)
+
+        public Game(string name, params NumberDie[] listDice)
         {
             Name = name;
-            AddDice(numberDie1);
+            this.listDice.AddRange(listDice);
+            ListDice = new ReadOnlyCollection<NumberDie>(this.listDice);
         }
 
         public string Name
@@ -51,7 +51,7 @@ namespace Model
         }
 
 
-        public bool AddDice(Die die)
+        public bool AddDice(NumberDie die)
         {
             if (listDice.Contains(die))
             {
@@ -61,18 +61,21 @@ namespace Model
             return true;
         }
 
-        public void AddDice(params Die[] die)
+        public IEnumerable<NumberDie> AddDices(params NumberDie[] die)
         {
-            for (int i = 0; i < die.Length; i++)
+            List<NumberDie> result = new();
+            foreach(var i in die)
             {
-                AddDice(die[i]);
+                if (AddDice(i))
+                {
+                    result.Add(i);
+                }
+                
             }
+            return result;
         }
 
-        public List<Die> GetDices()
-        {
-            return listDice;
-        }
+       
 
     }
 }
diff --git a/Sources/MaSoluction/Model/NumberDie.cs b/Sources/MaSoluction/Model/NumberDie.cs
index 17bfbe5..18720af 100644
--- a/Sources/MaSoluction/Model/NumberDie.cs
+++ b/Sources/MaSoluction/Model/NumberDie.cs
@@ -48,12 +48,12 @@ namespace Model
             return resultat;
         }
 
-        public override bool Equals(object? obj)
-        {
-            return obj is NumberDie die &&
-                   Name == die.Name &&
-                   min == die.min &&
-                   max == die.max;
-        }
+        //public override bool Equals(object? obj)
+       // {
+        //    return obj is NumberDie die &&
+         //          Name == die.Name &&
+        //           min == die.min &&
+         //          max == die.max;
+       // }
     }
 }
diff --git a/Sources/MaSoluction/Testeur/TesterStub.cs b/Sources/MaSoluction/Testeur/TesterStub.cs
index a3ba23a..f2d0fd1 100644
--- a/Sources/MaSoluction/Testeur/TesterStub.cs
+++ b/Sources/MaSoluction/Testeur/TesterStub.cs
@@ -16,9 +16,9 @@ namespace Testeur
             //Arange
             Manager m = new Manager(new Stub());
             NumberDie nd = new NumberDie("de1",1,6);
-           // Game d = new Game("de1");
+           // Acct
             m.AddDice(nd);
-
+            //Assert
             Assert.Equal("de1", nd.Name);
         }
     }
diff --git a/Sources/MaSoluction/Testeur/UnitTest1.cs b/Sources/MaSoluction/Testeur/UT_ConstructeurGame.cs
similarity index 82%
rename from Sources/MaSoluction/Testeur/UnitTest1.cs
rename to Sources/MaSoluction/Testeur/UT_ConstructeurGame.cs
index 56cae6f..a0c94bb 100644
--- a/Sources/MaSoluction/Testeur/UnitTest1.cs
+++ b/Sources/MaSoluction/Testeur/UT_ConstructeurGame.cs
@@ -2,7 +2,7 @@ using Model;
 
 namespace Testeur
 {
-    public class UnitTest1
+    public class UT_ConstructeurGame
     {
         [Fact]
         public void TestConstructeurGame()
diff --git a/Sources/MaSoluction/Testeur/UT_NumberDice.cs b/Sources/MaSoluction/Testeur/UT_NumberDice.cs
index 3f52a85..814af29 100644
--- a/Sources/MaSoluction/Testeur/UT_NumberDice.cs
+++ b/Sources/MaSoluction/Testeur/UT_NumberDice.cs
@@ -27,7 +27,7 @@ namespace Testeur
             Assert.Equal( expectedName,d.Name);
         }
 
-        public static IEnumerable<object[]> TestAddNumberDie()
+        public static IEnumerable<object[]> TestAddNumberDieToGame()
         {
             yield return new object[] {
                 true,
@@ -64,12 +64,12 @@ namespace Testeur
 
         }
         [Theory]
-        [MemberData(nameof(TestAddNumberDie))]
-        public void Test_AddGame(bool expectedResult, NumberDie[] expectedDie,Game game,NumberDie die)
+        [MemberData(nameof(TestAddNumberDieToGame))]
+        public void Test_AddGame(bool expectedResult, IEnumerable<NumberDie>expectedDie,Game game,NumberDie die)
         {
             bool resultat = game.AddDice(die);
             Assert.Equal(expectedResult, resultat);
-            Assert.Equal(expectedDie.Length,game.GetDices().Count);
+            Assert.Equal(expectedDie.Count(),game.ListDice.Count());
             Assert.All(expectedDie, i => game.ListDice.Contains(i));
         }