Kata refactoring

@@ -41,7 +41,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.153s</div>

+<div class="counter">0.175s</div>

 <p>duration</p>

 </div>

 </td>

@@ -76,7 +76,7 @@

 </thead>

 <tr>

 <td class="success">testAffichageBase()</td>

-<td class="success">0.153s</td>

+<td class="success">0.175s</td>

 <td class="success">passed</td>

 </tr>

 </table>

@@ -89,7 +89,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:47:26</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:58:46</p>

 </div>

 </div>

 </body>

@@ -41,7 +41,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.036s</div>

+<div class="counter">0.016s</div>

 <p>duration</p>

 </div>

 </td>

@@ -78,19 +78,19 @@

 <tr>

 <td class="success">addMoney</td>

 <td class="success">testAddMoney()</td>

-<td class="success">0.001s</td>

+<td class="success">0s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

 <td class="success">Affichage</td>

 <td class="success">testAffichage()</td>

-<td class="success">0.024s</td>

+<td class="success">0.006s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

 <td class="success">Main</td>

 <td class="success">testMain()</td>

-<td class="success">0.002s</td>

+<td class="success">0.001s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

@@ -102,13 +102,13 @@

 <tr>

 <td class="success">Natural Tests</td>

 <td class="success">testNatural()</td>

-<td class="success">0.001s</td>

+<td class="success">0.002s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

 <td class="success">Constructor Player</td>

 <td class="success">testPlayerConstructor()</td>

-<td class="success">0s</td>

+<td class="success">0.001s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

@@ -126,13 +126,13 @@

 <tr>

 <td class="success">ex &amp; lvl</td>

 <td class="success">testRetrieveLevel()</td>

-<td class="success">0.002s</td>

+<td class="success">0.001s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

 <td class="success">Construcor UpdatePlayer</td>

 <td class="success">testUpdatePlayer()</td>

-<td class="success">0.001s</td>

+<td class="success">0s</td>

 <td class="success">passed</td>

 </tr>

 </table>

@@ -145,7 +145,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:47:26</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:58:46</p>

 </div>

 </div>

 </body>

@@ -38,7 +38,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.189s</div>

+<div class="counter">0.191s</div>

 <p>duration</p>

 </div>

 </td>

@@ -85,7 +85,7 @@

 <td>11</td>

 <td>0</td>

 <td>0</td>

-<td>0.189s</td>

+<td>0.191s</td>

 <td class="success">100%</td>

 </tr>

 </tbody>

@@ -112,7 +112,7 @@

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.153s</td>

+<td>0.175s</td>

 <td class="success">100%</td>

 </tr>

 <tr>

@@ -122,7 +122,7 @@

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.036s</td>

+<td>0.016s</td>

 <td class="success">100%</td>

 </tr>

 </tbody>

@@ -136,7 +136,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:47:26</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:58:46</p>

 </div>

 </div>

 </body>

@@ -40,7 +40,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.189s</div>

+<div class="counter">0.191s</div>

 <p>duration</p>

 </div>

 </td>

@@ -83,7 +83,7 @@

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.153s</td>

+<td>0.175s</td>

 <td class="success">100%</td>

 </tr>

 <tr>

@@ -93,7 +93,7 @@

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.036s</td>

+<td>0.016s</td>

 <td class="success">100%</td>

 </tr>

 </table>

@@ -106,7 +106,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:47:26</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:58:46</p>

 </div>

 </div>

 </body>

@@ -1,7 +1,7 @@

 <?xml version="1.0" encoding="UTF-8"?>

-<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-10-21T09:47:25" hostname="a206pc27L.local.isima.fr" time="0.153">

+<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-10-21T09:58:45" hostname="a206pc27L.local.isima.fr" time="0.175">

   <properties/>

-  <testcase name="testAffichageBase()" classname="re.forestier.edu.GlobalTest" time="0.153"/>

+  <testcase name="testAffichageBase()" classname="re.forestier.edu.GlobalTest" time="0.175"/>

   <system-out><![CDATA[]]></system-out>

   <system-err><![CDATA[]]></system-err>

 </testsuite>

@@ -1,15 +1,15 @@

 <?xml version="1.0" encoding="UTF-8"?>

-<testsuite name="re.forestier.edu.UnitTests" tests="10" skipped="0" failures="0" errors="0" timestamp="2024-10-21T09:47:25" hostname="a206pc27L.local.isima.fr" time="0.042">

+<testsuite name="re.forestier.edu.UnitTests" tests="10" skipped="0" failures="0" errors="0" timestamp="2024-10-21T09:58:45" hostname="a206pc27L.local.isima.fr" time="0.023">

   <properties/>

-  <testcase name="Affichage" classname="re.forestier.edu.UnitTests" time="0.024"/>

-  <testcase name="Main" classname="re.forestier.edu.UnitTests" time="0.002"/>

+  <testcase name="Affichage" classname="re.forestier.edu.UnitTests" time="0.006"/>

+  <testcase name="Main" classname="re.forestier.edu.UnitTests" time="0.001"/>

   <testcase name="removeMoney" classname="re.forestier.edu.UnitTests" time="0.004"/>

-  <testcase name="ex &amp; lvl" classname="re.forestier.edu.UnitTests" time="0.002"/>

-  <testcase name="addMoney" classname="re.forestier.edu.UnitTests" time="0.001"/>

-  <testcase name="Construcor UpdatePlayer" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="ex &amp; lvl" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="addMoney" classname="re.forestier.edu.UnitTests" time="0.0"/>

+  <testcase name="Construcor UpdatePlayer" classname="re.forestier.edu.UnitTests" time="0.0"/>

   <testcase name="majDeFinDeTour" classname="re.forestier.edu.UnitTests" time="0.001"/>

-  <testcase name="Constructor Player" classname="re.forestier.edu.UnitTests" time="0.0"/>

-  <testcase name="Natural Tests" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="Constructor Player" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="Natural Tests" classname="re.forestier.edu.UnitTests" time="0.002"/>

   <testcase name="Sample test" classname="re.forestier.edu.UnitTests" time="0.0"/>

   <system-out><![CDATA[]]></system-out>

   <system-err><![CDATA[]]></system-err>

@@ -42,9 +42,21 @@ public class Player {

     public Player(String playerName, String avatar_name, String avatarClass, int money, ArrayList<String> inventory, int maxHp)

     {

-        Player p = new Player(playerName,avatar_name,avatarClass,money,inventory);

-        p.setMaxHealthPoints(maxHp);

-        p.setCurrentHealthPoints(maxHp);

+        if (!avatarClass.equals("ARCHER") && !avatarClass.equals("ADVENTURER") && !avatarClass.equals("DWARF")) 

+        {

+            return;

+        }

+

+        this.playerName = playerName;

+        Avatar_name = avatar_name;

+        AvatarClass = avatarClass;

+        this.money = Integer.valueOf(money);

+        this.inventory = inventory;

+        this.level = Natural.valueOf(1);

+        this.xp = 0;

+        this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(AvatarClass).get(1);

+        this.maxHealthPoint = Natural.valueOf(maxHp);

+        this.currentHealthPoints = Natural.valueOf(maxHp);

     }

     public String getPlayerName()

@@ -72,21 +84,11 @@ public class Player {

         return this.maxHealthPoint.toInt();

     }

-    public void setMaxHealthPoints(int hp)

-    {

-        this.maxHealthPoint = Natural.valueOf(hp);

-    }

-

     public int getCurrentHealthPoints()

     {

         return this.currentHealthPoints.toInt();

     }

-    public void setCurrentHealthPoints(int hp)

-    {

-        this.currentHealthPoints = Natural.valueOf(hp);

-    }

-

     public void heal(int hp)

     {

         if(hp < 0 )

@@ -129,12 +129,6 @@ public class UpdatePlayer {

                     player.hurt(1);

                 }

             }

-        } else 

-        {

-            if(player.getCurrentHealthPoints() >= player.getMaxHealthPoints()) {

-                player.setCurrentHealthPoints(player.getMaxHealthPoints());

-                return;

-            }

         } 

     }

@@ -119,70 +119,62 @@ public class UnitTests {

     @Test

     @DisplayName("majDeFinDeTour")

     void testMajFinTour() {

-        Player p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());

-        p.setCurrentHealthPoints(0);

+        Player p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>(),10);

+        p.hurt(10);

         UpdatePlayer.majFinDeTour(p);

         assertEquals("Le joueur est KO !", outContent.toString().trim());

-        p.setCurrentHealthPoints(1);

-        p.setMaxHealthPoints(10);

+        p.heal(1);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(2));

         p.addXp(100);

         UpdatePlayer.majFinDeTour(p);

-        p.setCurrentHealthPoints(9);

+        p.heal(5);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(9));

-        p.setCurrentHealthPoints(11);

+        p.heal(11);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(p.getMaxHealthPoints()));

-        p = new Player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>());

-        p.setCurrentHealthPoints(1);

-        p.setMaxHealthPoints(10);

+        p = new Player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>(),10);

+        p.hurt(9);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(2));

-        p = new Player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>());

-        p.setCurrentHealthPoints(5);

-        p.setMaxHealthPoints(10);

+        p = new Player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>(),10);

+        p.hurt(5);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(5));

         ArrayList<String> inv = new ArrayList<String>();

         inv.add("Holy Elixir");

-        p = new Player("Florian", "Grognak le barbare", "DWARF", 100, inv);

-        p.setCurrentHealthPoints(1);

-        p.setMaxHealthPoints(10);

+        p = new Player("Florian", "Grognak le barbare", "DWARF", 100, inv,10);

+        p.hurt(9);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(3));

-        p = new Player("Florian", "Grognak le barbare", "ARCHER", 100, new ArrayList<>());

-        p.setCurrentHealthPoints(1);

-        p.setMaxHealthPoints(10);

+        p = new Player("Florian", "Grognak le barbare", "ARCHER", 100, new ArrayList<>(),10);

+        p.hurt(9);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(2));

-        p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());

-        p.setCurrentHealthPoints(1);

-        p.setMaxHealthPoints(10);

+        p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>(),10);

+        p.hurt(9);

         p.addXp(28);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(3));

         inv.add("Magic Bow");

-        p = new Player("Florian", "Grognak le barbare", "ARCHER", 100, inv);

-        p.setCurrentHealthPoints(1);

-        p.setMaxHealthPoints(10);

+        p = new Player("Florian", "Grognak le barbare", "ARCHER", 100, inv,10);

+        p.hurt(9);;

         UpdatePlayer.majFinDeTour(p);

-        assertThat(p.getCurrentHealthPoints(),is(2)); //Suite a discussion avec le client, le "Magic bow" ne peut que soigné

-        p.setCurrentHealthPoints(16);

-        p.setMaxHealthPoints(40);

+        assertThat(p.getCurrentHealthPoints(),is(2)); //Suite a discussion avec le client, le "Magic bow" ne peut que soigner

+        p = new Player("Florian", "Grognak le barbare", "ARCHER", 100, inv,40);

+        p.hurt(24);

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.getCurrentHealthPoints(),is(17 + 17/8-1));

-        p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());

-        p.setCurrentHealthPoints(20);

-        p.setMaxHealthPoints(40);

+        p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>(),40);

+        p.hurt(20);

         UpdatePlayer.majFinDeTour(p);

         assertEquals(p.getCurrentHealthPoints(),20);

     }