From 0ac2b5bc0f5103424f88334d0f0d959e36701568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= <remi.lavergne@etu.uca.fr>
Date: Wed, 15 May 2024 17:51:24 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=92=EF=B8=8F=20Traduction=20et=20factoris?=
 =?UTF-8?q?ation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/Trek-12/Models/Game/{De.cs => Dice.cs}   | 13 ++++++-------
 source/Trek-12/Tests/{DeTest.cs => DiceTest.cs} | 14 +++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)
 rename source/Trek-12/Models/Game/{De.cs => Dice.cs} (80%)
 rename source/Trek-12/Tests/{DeTest.cs => DiceTest.cs} (85%)

diff --git a/source/Trek-12/Models/Game/De.cs b/source/Trek-12/Models/Game/Dice.cs
similarity index 80%
rename from source/Trek-12/Models/Game/De.cs
rename to source/Trek-12/Models/Game/Dice.cs
index 3ca9642..64f0819 100644
--- a/source/Trek-12/Models/Game/De.cs
+++ b/source/Trek-12/Models/Game/Dice.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Models.Game
 {
-    public class De
+    public class Dice
     {
         public int NbMin { get; private set; }
 
@@ -14,7 +14,7 @@ namespace Models.Game
 
         public int Nb { get; private set; }
 
-        public De(int nbmin)
+        public Dice(int nbmin)
         {
             if (nbmin < 0) nbmin = 0;
             if (nbmin > 1) nbmin = 1;
@@ -22,7 +22,7 @@ namespace Models.Game
             NbMax = nbmin + 5;
         }
 
-        public De()
+        public Dice()
         {
             NbMin = 0;
             NbMax = 5;
@@ -38,10 +38,9 @@ namespace Models.Game
             Nb = new Random().Next(NbMin, NbMax + 1);
         }
 
-        public bool IsLower(De de1)
-        {
-            if (de1.Nb > this.Nb) return true;
-            else return false;
+        public bool IsLower(Dice dice2)
+        {
+            return dice2.Nb > this.Nb;
         }
     }
 }
\ No newline at end of file
diff --git a/source/Trek-12/Tests/DeTest.cs b/source/Trek-12/Tests/DiceTest.cs
similarity index 85%
rename from source/Trek-12/Tests/DeTest.cs
rename to source/Trek-12/Tests/DiceTest.cs
index 3b77fd5..b18d16a 100644
--- a/source/Trek-12/Tests/DeTest.cs
+++ b/source/Trek-12/Tests/DiceTest.cs
@@ -7,12 +7,12 @@ using Models.Game;
 
 namespace Tests;
 
-public class DeTest
+public class DiceTest
 {
     [Fact]
     public void TestConstructor()
     {
-        De d = new De();
+        Dice d = new Dice();
         Assert.NotNull(d);
         Assert.Equal(0, d.NbMin);
         Assert.Equal(5, d.NbMax);
@@ -21,7 +21,7 @@ public class DeTest
     [Fact]
     public void TestConstructorRebelotteWithInvalidNbMin()
     {
-        De d = new De(2);
+        Dice d = new Dice(2);
         Assert.NotNull(d);
         Assert.Equal(1, d.NbMin);
         Assert.Equal(6, d.NbMax);
@@ -30,7 +30,7 @@ public class DeTest
     [Fact]
     public void TestConstructorReRebelotteWithAnotherInvalidNbMin()
     {
-        De d = new De(-2);
+        Dice d = new Dice(-2);
         Assert.NotNull(d);
         Assert.Equal(0, d.NbMin);
         Assert.Equal(5, d.NbMax);
@@ -39,7 +39,7 @@ public class DeTest
     [Fact]
     public void TestConstructorRebelotteWithValidNbMin()
     {
-        De d = new De(1);
+        Dice d = new Dice(1);
         Assert.NotNull(d);
         Assert.Equal(1, d.NbMin);
         Assert.Equal(6, d.NbMax);
@@ -48,7 +48,7 @@ public class DeTest
     [Fact]
     public void TestConstructorRebelotteWithAnotherValidNbMin()
     {
-        De d = new De(0);
+        Dice d = new Dice(0);
         Assert.NotNull(d);
         Assert.Equal(0, d.NbMin);
         Assert.Equal(5, d.NbMax);
@@ -57,7 +57,7 @@ public class DeTest
     [Fact]
     public void TestLancer()
     {
-        De d = new De();
+        Dice d = new Dice();
         Assert.NotNull(d);
         Assert.IsType<int>(d.Nb);
         Assert.InRange(d.Nb, d.NbMin, d.NbMax);