Kata refactoring

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

 </td>

 <td>

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

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

+<div class="counter">0.162s</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.162s</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 13 déc. 2024 à 12:05:19</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 13 déc. 2024 à 12:29:27</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.069s</div>

 <p>duration</p>

 </div>

 </td>

@@ -84,19 +84,19 @@

 <tr>

 <td class="success">Item and player</td>

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

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

+<td class="success">0.002s</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">Item tests</td>

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

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

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

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

 </tr>

 <tr>

@@ -138,13 +138,13 @@

 <tr>

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

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

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

+<td class="success">0.014s</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.004s</td>

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

 </tr>

 </table>

@@ -157,7 +157,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 13 déc. 2024 à 12:05:19</p>

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

 </div>

 </div>

 </body>

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

 </td>

 <td>

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

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

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

 <p>duration</p>

 </div>

 </td>

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

 <td>13</td>

 <td>0</td>

 <td>0</td>

-<td>0.205s</td>

+<td>0.231s</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.162s</td>

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

 </tr>

 <tr>

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

 <td>12</td>

 <td>0</td>

 <td>0</td>

-<td>0.036s</td>

+<td>0.069s</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 13 déc. 2024 à 12:05:19</p>

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

 </div>

 </div>

 </body>

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

 </td>

 <td>

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

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

+<div class="counter">0.231s</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.162s</td>

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

 </tr>

 <tr>

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

 <td>12</td>

 <td>0</td>

 <td>0</td>

-<td>0.036s</td>

+<td>0.069s</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 13 déc. 2024 à 12:05:19</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 13 déc. 2024 à 12:29:27</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-12-13T11:05:19" hostname="clement-G551JM" time="0.169">

+<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-12-13T11:29:27" hostname="clement-G551JM" time="0.162">

   <properties/>

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

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

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

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

 </testsuite>

@@ -1,13 +1,13 @@

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

-<testsuite name="re.forestier.edu.UnitTests" tests="12" skipped="0" failures="0" errors="0" timestamp="2024-12-13T11:05:19" hostname="clement-G551JM" time="0.049">

+<testsuite name="re.forestier.edu.UnitTests" tests="12" skipped="0" failures="0" errors="0" timestamp="2024-12-13T11:29:27" hostname="clement-G551JM" time="0.083">

   <properties/>

-  <testcase name="Item tests" classname="re.forestier.edu.UnitTests" time="0.009"/>

+  <testcase name="Item tests" classname="re.forestier.edu.UnitTests" time="0.035"/>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -12,6 +12,7 @@ public class Natural implements Comparable<Natural>, Cloneable

     private Natural(Integer i)

     {

+        assert i != null : "Argument must be non null";

         if(i == null)

             throw new IllegalArgumentException();

         if(i < 0)

@@ -38,6 +39,7 @@ public class Natural implements Comparable<Natural>, Cloneable

     public static Natural valueOf(Integer i)

     {

+        assert i != null : "Argument must be non null";

         if(i == null)

             throw new IllegalArgumentException();

         return new Natural(i);

@@ -50,6 +52,7 @@ public class Natural implements Comparable<Natural>, Cloneable

     public void add(Natural n)

     {

+        assert n != null : "Argument must be non null";

         if(n == null)

             throw new IllegalArgumentException();

         this.value += n.toInt();

@@ -58,6 +61,7 @@ public class Natural implements Comparable<Natural>, Cloneable

     public void substract(Natural n)

     {

+        assert n != null : "Argument must be non null";

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

             throw new IllegalArgumentException();

         this.value -= n.toInt();

@@ -90,8 +94,7 @@ public class Natural implements Comparable<Natural>, Cloneable

     @Override

     public int compareTo(Natural n)

     {

-        if(n == null)

-            throw new IllegalArgumentException();

+        assert n != null : "Argument must be non null";

         if(n.value > this.value)

             return 1;

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

@@ -9,11 +9,13 @@ public class Affichage {

     public static void afficherJoueur(Player player) 

     {

+        assert player != null : "Player must be non null";

         System.out.println(player.toString());

     }

     public static void playerToMarkDown(Player p)

     {

+        assert p != null : "Player must be non null";

         try 

         {

             File playerFile = new File("./"+p.getAvatarName()+".md");

@@ -29,6 +31,8 @@ public class Affichage {

     public static void playerToMarkDown(Player p, String path)

     {

+        assert p != null : "Player must be non null";

+        assert path != null : "Path must be non null";

         try 

         {

             File playerFile = new File(path+p.getAvatarName()+".md");

@@ -11,6 +11,11 @@ public class Item implements Cloneable

 	public Item(String name, String description, Natural weight, Natural value)

 	{

+		assert name != null : "Name must be non null";

+		assert description != null : "Description must be non null";

+		assert weight != null : "Weight must be non null";

+		assert value != null : "Value must be non null";

+

 		this.name = name;

 		this.description = description;

 		this.weight = weight;

@@ -19,6 +24,7 @@ public class Item implements Cloneable

 	Item(String name)

 	{

+		assert name != null : "Name must be non null";

 		this.name = name;

 		this.description = "Is used to search in list, if you see me, there is a problem";

 	}

@@ -19,7 +19,9 @@ public class Manager {

        //Since we don't have value for weight and value, we put neutral

     // majFinDeTour met à jour les points de vie

-    public static void majFinDeTour(Player player) {

+    public static void majFinDeTour(Player player) 

+    {

+        assert player != null : "Player must be non null";

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

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

             return;

@@ -40,6 +40,11 @@ public class Player {

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

     {

+        assert playerName != null : "Player name can't be null";

+        assert avatar_name != null : "Avatar name can't be null";

+        assert avatarClass != null : "Avatar class can't be null";

+        assert inventory != null : "Inventory can't be null";

+

         this.playerName = playerName;

         this.avatarName = avatar_name;

         this.avatarClass = avatarClass;

@@ -124,6 +129,7 @@ public class Player {

     public void addItem(Item i)

     {

+        assert i != null : "Argument must be non null";

         Natural w = (Natural)this.weight.clone();

         w.add(i.getWeight());

         if(w.compareTo(this.maxWeight) == -1)

@@ -138,6 +144,7 @@ public class Player {

     public void removeItem(Item i)

     {

+        assert i != null : "Argument must be non null";

         if(!this.inventory.contains(i))

         {

             throw new UnsupportedOperationException("Can't remove what player don't have");

@@ -148,6 +155,7 @@ public class Player {

     public void buy(Item i)

     {

+        assert i != null : "Argument must be non null";

         if(this.money.compareTo(i.getValue()) == 1)

         {

             throw new UnsupportedOperationException("Player doesn't have enough money.");

@@ -168,6 +176,7 @@ public class Player {

     public void sell(Item i)

     {

+        assert i != null : "Argument must be non null";

         if(!this.inventory.contains(i))

         {

             throw new UnsupportedOperationException("Player can't sell what they don't own.");

@@ -245,16 +245,16 @@ public class UnitTests {

         assertEquals(n.toInt(),2);

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

         assertTrue(Integer.valueOf(2).equals(n.toInteger()));

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

+        assertThrows(AssertionError.class, () -> Natural.valueOf((Integer)null));

         n = Natural.valueOf(Integer.valueOf(2));

         assertEquals(n.toInt(),2);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+        assertThrows(AssertionError.class, () -> Natural.valueOf(0).compareTo(null));

     }