Kata refactoring

@@ -10,10 +10,10 @@ public class Main {

         Player firstPlayer = new Player("Florian", "Ruzberg de Rivehaute", "DWARF", 200, new ArrayList<>());

         firstPlayer.addMoney(400);

-        UpdatePlayer.addXp(firstPlayer, 15);

+        firstPlayer.addXp(15);

         System.out.println(Affichage.afficherJoueur(firstPlayer));

         System.out.println("------------------");

-        UpdatePlayer.addXp(firstPlayer, 20);

+        firstPlayer.addXp(20);

         System.out.println(Affichage.afficherJoueur(firstPlayer));

     }

 }

\ No newline at end of file

@@ -5,7 +5,7 @@ import java.util.Random;

 public class UpdatePlayer {

-    private final static String[] objectList = {"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"

+    public final static String[] objectList = {"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"

     };

     public static HashMap<String, HashMap<Integer, HashMap<String, Integer>>> abilitiesPerTypeAndLevel() {

@@ -98,30 +98,6 @@ public class UpdatePlayer {

         return abilitiesPerTypeAndLevel;

     }

-    public static boolean addXp(Player player, int xp) {

-        int currentLevel = player.retrieveLevel();

-        player.setXp(player.getXp()+xp);

-        int newLevel = player.retrieveLevel();

-

-        if (newLevel != currentLevel) {

-            // Player leveled-up!

-            // Give a random object

-            ;

-            Random random = new Random();

-            player.inventory.add(objectList[random.nextInt(objectList.length - 0) + 0]);

-

-            // Add/upgrade abilities to player

-            HashMap<String, Integer> abilities = abilitiesPerTypeAndLevel().get(player.getAvatarClass()).get(newLevel);

-            abilities.forEach((ability, level) -> {

-                player.abilities.put(ability, abilities.get(ability));

-            });

-            return true;

-        }

-        return false;

-    }

-

-

-

     // majFinDeTour met à jour les points de vie

     public static void majFinDeTour(Player player) {

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

@@ -18,7 +18,7 @@ public class GlobalTest {

     @Test

     void testAffichageBase() {

         Player player = new Player("Florian", "Gnognak le Barbare", "ADVENTURER", 200, new ArrayList<>());

-        UpdatePlayer.addXp(player, 20);

+        player.addXp(20);

         player.inventory = new ArrayList<>();

         verify(Affichage.afficherJoueur(player));

@@ -85,33 +85,31 @@ public class UnitTests {

     void testRetrieveLevel() {

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

         boolean b;

-        b = UpdatePlayer.addXp(p,5);

+        p.addXp(5);

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

         assertThat(p.retrieveLevel(),is(1));

-        b = UpdatePlayer.addXp(p,6);

+        p.addXp(6);

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

-        b = UpdatePlayer.addXp(p,22);

+        p.addXp(22);

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

-        b = UpdatePlayer.addXp(p,30);

+        p.addXp(30);

         assertThat(p.retrieveLevel(),is(4));

-        b = UpdatePlayer.addXp(p,100);

+        p.addXp(100);

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

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

         int tailleinv = p.inventory.size();

-        b = UpdatePlayer.addXp(p,10);

+        p.addXp(10);

         int atk = p.abilities.get("ATK");

         assertNotEquals(p.inventory.size(),tailleinv);

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

-        assertThat(b,is(true));

-        b = UpdatePlayer.addXp(p,17);

+        p.addXp(17);

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

-        b = UpdatePlayer.addXp(p,30);

+        p.addXp(30);

         assertThat(p.retrieveLevel(),is(4));

-        b = UpdatePlayer.addXp(p,54);

+        p.addXp(54);

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

-        b = UpdatePlayer.addXp(p,1);

-        assertThat(b,is(false));

+        p.addXp(1);

         assertNotEquals(p.abilities.get("ATK"),atk);

     }

@@ -126,7 +124,7 @@ public class UnitTests {

         p.setHealthPoints(10);

         UpdatePlayer.majFinDeTour(p);

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

-        boolean b = UpdatePlayer.addXp(p,100);

+        p.addXp(100);

         UpdatePlayer.majFinDeTour(p);

         p.setCurrentHealthPoints(9);

         UpdatePlayer.majFinDeTour(p);

@@ -164,7 +162,7 @@ public class UnitTests {

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

         p.setCurrentHealthPoints(1);

         p.setHealthPoints(10);

-        UpdatePlayer.addXp(p,28);

+        p.addXp(28);

         UpdatePlayer.majFinDeTour(p);

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