Kata refactoring

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

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

 </thead>

 <tr>

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

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

+<td class="success">0.203s</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 7 oct. 2024, 11:17:20</p>

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

 </div>

 </div>

 </body>

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

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

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

-<td class="success">testAfficage()</td>

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

+<td class="success">testAffichage()</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.013s</td>

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

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

 </tr>

 <tr>

@@ -102,7 +102,7 @@

 <tr>

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

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

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

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

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

 </tr>

 <tr>

@@ -114,25 +114,25 @@

 <tr>

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

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

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

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

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

 </tr>

 <tr>

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

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

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

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

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

 </tr>

 <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">0s</td>

+<td class="success">0.001s</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 7 oct. 2024, 11:17:20</p>

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

 </div>

 </div>

 </body>

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

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

 <td>11</td>

 <td>0</td>

 <td>0</td>

-<td>0.185s</td>

+<td>0.221s</td>

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

 </tr>

 </tbody>

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

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.151s</td>

+<td>0.203s</td>

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

 </tr>

 <tr>

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

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.034s</td>

+<td>0.018s</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 7 oct. 2024, 11:17:20</p>

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

 </div>

 </div>

 </body>

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

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

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.151s</td>

+<td>0.203s</td>

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

 </tr>

 <tr>

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

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.034s</td>

+<td>0.018s</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 7 oct. 2024, 11:17:20</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:07:21</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-07T09:17:20" hostname="a206pc27L.local.isima.fr" time="0.151">

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

   <properties/>

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

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

   <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-10-07T09:17:20" hostname="a206pc27L.local.isima.fr" time="0.041">

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

   <properties/>

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

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

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

-  <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="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.001"/>

+  <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="majDeFinDeTour" classname="re.forestier.edu.UnitTests" time="0.001"/>

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

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

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

-  <testcase name="Sample test" 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>

 </testsuite>

@@ -0,0 +1,118 @@

+package re.forestier.edu.lib;

+

+public class Natural implements Comparable<Natural>, Cloneable

+{

+    private int value;

+    public static final Natural ZERO = new ZERO();

+

+    public Natural()

+    {

+        this.value = 0;

+    }

+

+    private Natural(Integer i)

+    {

+        if(i == null)

+            throw new IllegalArgumentException();

+        if(i < 0)

+            throw new IllegalArgumentException("Natural >=0");

+        this.value = i;

+    }

+

+    private Natural(int i)

+    {

+        if(i < 0)

+            throw new IllegalArgumentException("Natural >=0");

+        this.value = i;

+    }

+

+    public Integer toInteger()

+    {

+        return Integer.valueOf(this.value);

+    }

+

+    public int toInt()

+    {

+        return this.value;

+    }

+

+    public static Natural valueOf(Integer i)

+    {

+        if(i == null)

+            throw new IllegalArgumentException();

+        return new Natural(i);

+    }

+

+    public static Natural valueOf(int i)

+    {

+        return new Natural(i);

+    }

+

+    public void add(Natural n)

+    {

+        if(n == null)

+            throw new IllegalArgumentException();

+        this.value += n.toInt();

+    }

+

+

+    public void substract(Natural n)

+    {

+        if(n == null || this.compareTo(n) == 1)

+            throw new IllegalArgumentException();

+        this.value -= n.toInt();

+    } 

+

+    public void divide(Natural n)

+    {

+        if(n == null || n == Natural.ZERO)

+            throw new IllegalArgumentException();

+        this.value /= n.toInt();

+    }

+

+

+    @Override

+    public Object clone()

+    {

+        return Natural.valueOf(this.value);

+    }

+

+    @Override

+    public String toString()

+    {

+        return String.valueOf(this.value);

+    }

+

+    @Override

+    public boolean equals(Object o)

+    {

+        if(o == null)

+            return false;

+        if(o == this)

+            return true;

+        if(!(o instanceof Natural))

+            return false;

+        return this.value == ((Natural)o).value;

+    }

+

+    @Override

+    public int compareTo(Natural n)

+    {

+        if(n == null)

+            throw new IllegalArgumentException();

+        if(n.value > this.value)

+            return 1;

+        else if(n.value == this.value)

+            return 0;

+        else

+            return -1;

+    }

+

+    private static class ZERO extends Natural

+    {

+        private ZERO()

+        {

+            super(0);

+        }

+    }

+}

\ No newline at end of file

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

 import java.util.Random;

 import java.util.ArrayList;

 import java.util.HashMap;

+import re.forestier.edu.lib.Natural;

 public class Player {

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

@@ -15,7 +16,7 @@ public class Player {

     private Integer money;

     private Float __real_money__;

-    private int level;

+    private Natural level;

     private int healthpoints;

     private int currenthealthpoints;

     private int xp;

@@ -34,7 +35,7 @@ public class Player {

         AvatarClass = avatarClass;

         this.money = Integer.valueOf(money);

         this.inventory = inventory;

-        this.level = 1;

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

         this.xp = 0;

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

     }

@@ -56,7 +57,7 @@ public class Player {

     public int getLevel()

     {

-        return this.level;

+        return this.level.toInt();

     }

     public int getHealthPoints()

@@ -94,7 +95,7 @@ public class Player {

     }

     public void addXp(int xp) {

-        int ancientLevel = this.level;

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

         this.xp += xp;

         int i = 0;

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

@@ -102,9 +103,9 @@ public class Player {

             i++;

         }

-        this.level = i;

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

-        if (this.level != ancientLevel) {

+        if (!ancientLevel.equals(this.level)) {

             // Player leveled-up!

             // Give a random object

             ;

@@ -112,7 +113,7 @@ public class Player {

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

             // Add/upgrade abilities to player

-            HashMap<String, Integer> abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(this.getAvatarClass()).get(this.level);

+            HashMap<String, Integer> abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(this.getAvatarClass()).get(this.level.toInt());

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

                 this.abilities.put(ability, abilities.get(ability));

             });

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

     @Test

     @DisplayName("Affichage")

-    void testAfficage() {

+    void testAffichage() {

         Affichage a = new Affichage();

         assertNotNull(a);

@@ -212,6 +212,7 @@ public class UnitTests {

     {

         Natural n = new Natural();

         assertNotNull(n);

+        assertNotNull(Natural.valueOf(2));

         assertEquals(n.toInt(),0);

         n = Natural.valueOf(2);

@@ -224,18 +225,21 @@ public class UnitTests {

         assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(Integer.valueOf(-2)));

         assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(null));

-        assertEquals(n.add(Natural.valueOf(2)),Natural.valueOf(4));

+        n.add(Natural.valueOf(2));

+        assertEquals(n,Natural.valueOf(4));

         assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(0).add(null));

-        assertEquals(n.substract(Natural.valueOf(2)),Natural.valueOf(0));

+        n.substract(Natural.valueOf(4));

+        assertEquals(n,Natural.valueOf(0));

         assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(0).substract(Natural.valueOf(4)));

-        assertEquals(n.toString(),"2");

-        assertTrue(n.equals(Natural.valueOf(2)));

+        assertEquals(n.toString(),"0");

+        assertTrue(n.equals(Natural.valueOf(0)));

         assertTrue(n.equals(n));

         assertFalse(n.equals(Natural.valueOf(3)));

-        assertFalse(n.equals(Integer.valueOf(0)));

+        assertFalse(n.equals(Integer.valueOf(4)));

         assertFalse(n.equals(null));

+        n.add(Natural.valueOf(2));

         assertEquals(n.compareTo(Natural.valueOf(2)),0);

         assertEquals(n.compareTo(Natural.valueOf(3)),1);

         assertEquals(n.compareTo(Natural.valueOf(1)),-1);