Kata refactoring

@@ -8,7 +8,13 @@ import re.forestier.edu.lib.Natural;

 public class Player {

     private static final Natural defaultMaxHp = Natural.valueOf(20);

-    private static final Integer[] xpForlevel = {0,10,27,57,111}; //Level = i+1 

+    private static final Natural[] xpForlevel = {

+        Natural.valueOf(0),

+        Natural.valueOf(10),

+        Natural.valueOf(27),

+        Natural.valueOf(57),

+        Natural.valueOf(111)

+    }; //Level = i+1 

        //We consider that level is a player thing, not a job one.

     private String playerName;

@@ -23,7 +29,7 @@ public class Player {

     private Natural currentHealthPoints;

     private Natural xp;

-    public HashMap<Ability, Integer> abilities; //Ability = stat

+    private HashMap<Ability, Integer> abilities; //Ability = stat

     public ArrayList<String> inventory;

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

@@ -84,6 +90,15 @@ public class Player {

         return this.currentHealthPoints.toInt();

     }

+    public HashMap<Ability,Integer> getAbilities()

+    {

+        HashMap<Ability,Integer> copy = new HashMap<Ability,Integer>(); //In doubt, deep copy

+        this.abilities.forEach((key,value) -> {

+            copy.put(key,value);}

+        );

+        return copy;

+    }

+

     public void heal(int hp)

     {

         if(hp < 0 )

@@ -120,7 +135,7 @@ public class Player {

         Natural ancientLevel = (Natural)this.level.clone();

         this.xp.add(Natural.valueOf(xp));

         int i = 0;

-        while(i < xpForlevel.length && this.xp.toInt() >= xpForlevel[i])

+        while(i < xpForlevel.length && this.xp.compareTo(xpForlevel[i]) <= 0)

         {

             i++;

         }

@@ -116,8 +116,8 @@ public class UnitTests {

         int tailleinv = p.inventory.size();

         p.addXp(10);

         /*fail(p.avatarClass.getAbilityPerLevel().toString());

-        fail(p.abilities.toString());*/

-        int atk = p.abilities.get(Ability.ATK);

+        fail(p.getAbilities().toString());*/

+        int atk = p.getAbilities().get(Ability.ATK);

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

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

         p.addXp(17);

@@ -127,7 +127,7 @@ public class UnitTests {

         p.addXp(54);

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

         p.addXp(1);

-        assertNotEquals(p.abilities.get(Ability.ATK),atk);

+        assertNotEquals(p.getAbilities().get(Ability.ATK),atk);

     }

     @Test