Kata refactoring

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

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

 </thead>

 <tr>

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

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

+<td class="success">0.221s</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 27 nov. 2024, 15:31:35</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 13 déc. 2024 à 09:16:49</p>

 </div>

 </div>

 </body>

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

@@ -78,55 +78,55 @@

 <tr>

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

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

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

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

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

 </tr>

 <tr>

 <td class="success">Heal and hurt</td>

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

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

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

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

 </tr>

 <tr>

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

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

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

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

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

 </tr>

 <tr>

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

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

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

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

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

 </tr>

 <tr>

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

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

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

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

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

 </tr>

 <tr>

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

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

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

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

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

 </tr>

 <tr>

 <td class="success">Sample test</td>

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

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

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

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

 </tr>

 <tr>

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

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

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

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

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

 </tr>

 <tr>

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

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

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

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

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

 </tr>

 <tr>

@@ -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 27 nov. 2024, 15:31:35</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 13 déc. 2024 à 09:16:49</p>

 </div>

 </div>

 </body>

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

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

 <td>11</td>

 <td>0</td>

 <td>0</td>

-<td>0.191s</td>

+<td>0.258s</td>

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

 </tr>

 </tbody>

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

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.169s</td>

+<td>0.221s</td>

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

 </tr>

 <tr>

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

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.022s</td>

+<td>0.037s</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 27 nov. 2024, 15:31:35</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 13 déc. 2024 à 09:16:49</p>

 </div>

 </div>

 </body>

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

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

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.169s</td>

+<td>0.221s</td>

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

 </tr>

 <tr>

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

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.022s</td>

+<td>0.037s</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 27 nov. 2024, 15:31:35</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 13 déc. 2024 à 09:16:49</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-11-27T14:31:35" hostname="ada.local.isima.fr" time="0.169">

+<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-12-13T08:16:49" hostname="clement-G551JM" time="0.221">

   <properties/>

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

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

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

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

 </testsuite>

@@ -1,16 +1,16 @@

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

-<testsuite name="re.forestier.edu.UnitTests" tests="10" skipped="0" failures="0" errors="0" timestamp="2024-11-27T14:31:35" hostname="ada.local.isima.fr" time="0.029">

+<testsuite name="re.forestier.edu.UnitTests" tests="10" skipped="0" failures="0" errors="0" timestamp="2024-12-13T08:16:49" hostname="clement-G551JM" time="0.047">

   <properties/>

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

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

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

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

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

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

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

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

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

+  <testcase name="Heal and hurt" classname="re.forestier.edu.UnitTests" time="0.002"/>

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

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

-  <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"/>

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

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

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

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

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

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

 </testsuite>

@@ -1,6 +1,6 @@

 package re.forestier.edu;

 import re.forestier.edu.rpg.Affichage;

-import re.forestier.edu.rpg.UpdatePlayer;

+import re.forestier.edu.rpg.Manager;

 import re.forestier.edu.rpg.Player;

 import re.forestier.edu.rpg.Jobs;

@@ -131,7 +131,7 @@ public class Player {

             // Player leveled-up!

             // Give a random object

             Random random = new Random();

-            this.inventory.add(UpdatePlayer.objectList[random.nextInt(UpdatePlayer.objectList.length)]);

+            this.inventory.add(Manager.objectList[random.nextInt(Manager.objectList.length)]);

             // Add/upgrade abilities to player

             avatarClass.getAbilityPerLevel().forEach((ability,value)->

@@ -178,12 +178,6 @@ public class Player {

             } 

         } 

-        /*this.abilities.forEach((ability, level) -> {

-            if(level != 0)

-            {

-                sb.append("\n   " + ability.toString() + " : " + level);

-            } 

-        });*/

         sb.append("\n\nInventaire :");

         this.inventory.forEach(item -> {

             sb.append("\n   " + item);

@@ -1,45 +0,0 @@

-package re.forestier.edu.rpg;

-

-import java.util.HashMap;

-import java.util.Random;

-

-public class UpdatePlayer {

-

-    public final static String[] objectList = {"Magic bow : Heal by 1/8th of your HP","Lookout Ring : Prevents surprise attacks","Scroll of Stupidity : INT-2 when applied to an enemy", "Draupnir : Increases XP gained by 100%", "Magic Charm : Magic +10 for 5 rounds", "Rune Staff of Curse : May burn your ennemies... Or yourself. Who knows?", "Combat Edge : Well, that's an edge", "Holy Elixir : Recover your HP"

-    };

-

-    // majFinDeTour met à jour les points de vie

-    public static void majFinDeTour(Player player) {

-        if(player.getCurrentHealthPoints() == 0) {

-            System.out.println("Le joueur est KO !");

-            return;

-        }

-

-        if(player.getCurrentHealthPoints() < player.getMaxHealthPoints()/2) {

-            switch(player.getAvatarClass())

-            {

-                case ADVENTURER :

-                    player.heal(2);

-                    if(player.getLevel() < 3) {

-                        player.hurt(1);

-                    }

-                    break;

-                case DWARF :

-                    player.heal(1);

-                    if(player.inventory.contains("Holy Elixir")) {

-                        player.heal(1);

-                    }

-                    break;

-                case ARCHER :

-                    player.heal(1);

-                    if(player.inventory.contains("Magic Bow")) {

-                        int potentialHeal = player.getCurrentHealthPoints()/8-1;

-                        player.heal(potentialHeal < 0 ? 0 : potentialHeal);

-                    }

-                    break;

-            }

-        } 

-    }

-

-

-}

\ No newline at end of file

@@ -3,7 +3,7 @@ package re.forestier.edu;

 import org.junit.jupiter.api.DisplayName;

 import org.junit.jupiter.api.Test;

 import re.forestier.edu.rpg.Affichage;

-import re.forestier.edu.rpg.UpdatePlayer;

+import re.forestier.edu.rpg.Manager;

 import re.forestier.edu.rpg.Player;

 import re.forestier.edu.rpg.Jobs;

@@ -89,9 +89,9 @@ public class UnitTests {

     }

     @Test

-    @DisplayName("Construcor UpdatePlayer")

-    void testUpdatePlayer() {

-        UpdatePlayer p = new UpdatePlayer();

+    @DisplayName("Construcor Manager")

+    void testManager() {

+        Manager p = new Manager();

         assertNotNull(p);

     }

@@ -136,61 +136,61 @@ public class UnitTests {

         assertEquals(Ability.ATK.toString(),"ATK");

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

         p.hurt(10);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

         p.heal(1);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

         p.addXp(100);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

         p.heal(5);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

         p.heal(11);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

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

         p.hurt(9);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

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

         p.hurt(5);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

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

         inv.add("Holy Elixir");

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

         p.hurt(9);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

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

         p.hurt(9);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

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

         p.hurt(9);

         p.addXp(28);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

         inv.add("Magic Bow");

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

         p.hurt(9);;

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

         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", Jobs.ARCHER, 100, inv,40);

         p.hurt(24);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

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

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

         p.hurt(20);

-        UpdatePlayer.majFinDeTour(p);

+        Manager.majFinDeTour(p);

         assertEquals(p.getCurrentHealthPoints(),20);

     }