Kata refactoring

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

 package re.forestier.edu;

 import re.forestier.edu.rpg.Affichage;

 import re.forestier.edu.rpg.UpdatePlayer;

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

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

 import java.util.ArrayList;

 public class Main {

     public static void main(String[] args) {

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

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

         firstPlayer.addMoney(400);

         UpdatePlayer.addXp(firstPlayer, 15);

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

 public class Affichage {

-    public static String afficherJoueur(player player) {

+    public static String afficherJoueur(Player player) {

         final String[] finalString = {"Joueur " + player.Avatar_name + " joué par " + player.playerName};

         finalString[0] += "\nNiveau : " + player.retrieveLevel() + " (XP totale : " + player.xp + ")";

         finalString[0] += "\n\nCapacités :";

@@ -98,7 +98,7 @@ public class UpdatePlayer {

         return abilitiesPerTypeAndLevel;

     }

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

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

         int currentLevel = player.retrieveLevel();

         player.xp += xp;

         int newLevel = player.retrieveLevel();

@@ -123,7 +123,7 @@ public class UpdatePlayer {

     // majFinDeTour met à jour les points de vie

-    public static void majFinDeTour(player player) {

+    public static void majFinDeTour(Player player) {

         if(player.currenthealthpoints == 0) {

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

             return;

@@ -1,87 +0,0 @@

-package re.forestier.edu.rpg;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-

-public class player {

-    public String playerName;

-    public String Avatar_name;

-    private String AvatarClass;

-

-    public Integer money;

-    private Float __real_money__;

-

-    public int level;

-    public int healthpoints;

-    public int currenthealthpoints;

-    protected int xp;

-

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

-    public ArrayList<String> inventory;

-

-    public player(String playerName, String avatar_name, String avatarClass, int money, ArrayList<String> inventory) {

-        if (!avatarClass.equals("ARCHER") && !avatarClass.equals("ADVENTURER") && !avatarClass.equals("DWARF")) 

-        {

-            return;

-        }

-

-        this.playerName = playerName;

-        Avatar_name = avatar_name;

-        AvatarClass = avatarClass;

-        this.money = Integer.valueOf(money);

-        this.inventory = inventory;

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

-    }

-

-    public String getAvatarClass () {

-        return AvatarClass;

-    }

-

-    public void removeMoney(int amount) throws IllegalArgumentException {

-        if (money - amount < 0) {

-            throw new IllegalArgumentException("Player can't have a negative money!");

-        }

-

-        money = Integer.parseInt(money.toString()) - amount;

-    }

-    public void addMoney(int amount) {

-        var value = Integer.valueOf(amount);

-        money = money + (value != null ? value : 0);

-    }

-    public int retrieveLevel() {

-        // (lvl-1) * 10 + round((lvl * xplvl-1)/4)

-        HashMap<Integer, Integer> levels = new HashMap<>();

-        levels.put(2,10); // 1*10 + ((2*0)/4)

-        levels.put(3,27); // 2*10 + ((3*10)/4)

-        levels.put(4,57); // 3*10 + ((4*27)/4)

-        levels.put(5,111); // 4*10 + ((5*57)/4)

-        //TODO : ajouter les prochains niveaux

-

-        if (xp < levels.get(2)) {

-            return 1;

-        }

-        else if (xp < levels.get(3)) {return 2;

-        }

-        if (xp < levels.get(4)) {

-            return 3;

-        }

-        if (xp < levels.get(5)) return 4;

-        return 5;

-    }

-

-    public int getXp() {

-        return this.xp;

-    }

-

-    /*

-    Ингредиенты:

-        Для теста:

-

-            250 г муки

-            125 г сливочного масла (холодное)

-            70 г сахара

-            1 яйцо

-            1 щепотка соли

-     */

-

-}

\ No newline at end of file

@@ -4,7 +4,7 @@ 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.player;

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

 import java.util.ArrayList;

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

     @Test

     void testAffichageBase() {

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

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

         UpdatePlayer.addXp(player, 20);

         player.inventory = new ArrayList<>();

@@ -33,29 +33,29 @@ public class UnitTests {

     @Test

     @DisplayName("Sample test")

     void testPlayerName() {

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

-        assertThat(player.playerName, is("Florian"));

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

+        assertThat(Player.playerName, is("Florian"));

     }

     @Test

-    @DisplayName("Constructor player")

+    @DisplayName("Constructor Player")

     void testPlayerConstructor()

     {

-        player p = new player("Florian", "Grognak le barbare", "jgn", 100, new ArrayList<>());

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

         assertThat(p.playerName, not("Florian"));

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

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

         assertThat(p.playerName, is("Florian"));

-        p = new player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>());

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

         assertThat(p.playerName, is("Florian"));

-        p = new player("Florian", "Grognak le barbare", "ARCHER", 100, new ArrayList<>());

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

         assertThat(p.playerName, is("Florian"));

     }

     @Test

     @DisplayName("removeMoney")

     void testRemoveMoney() {

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

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

         assertThrows(IllegalArgumentException.class, () -> p.removeMoney(200));

         p.removeMoney(50);

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

     @Test

     @DisplayName("addMoney")

     void testAddMoney() {

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

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

         p.addMoney(50);

         assertThat(p.money, is(150));

     }

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

     @Test

     @DisplayName("ex & lvl")

     void testRetrieveLevel() {

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

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

         boolean b;

         b = UpdatePlayer.addXp(p,5);

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

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

         b = UpdatePlayer.addXp(p,100);

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

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

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

         int tailleinv = p.inventory.size();

         b = UpdatePlayer.addXp(p,10);

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

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

     @Test

     @DisplayName("majDeFinDeTour")

     void testMajFinTour() {

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

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

         p.currenthealthpoints = 0;

         UpdatePlayer.majFinDeTour(p);

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

@@ -135,13 +135,13 @@ public class UnitTests {

         UpdatePlayer.majFinDeTour(p);

         assertThat(p.currenthealthpoints,is(p.healthpoints));

-        p = new player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>());

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

         p.currenthealthpoints = 1;

         p.healthpoints = 10;

         UpdatePlayer.majFinDeTour(p);

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

-        p = new player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>());

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

         p.currenthealthpoints = 5;

         p.healthpoints = 10;

         UpdatePlayer.majFinDeTour(p);

@@ -149,19 +149,19 @@ public class UnitTests {

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

         inv.add("Holy Elixir");

-        p = new player("Florian", "Grognak le barbare", "DWARF", 100, inv);

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

         p.currenthealthpoints = 1;

         p.healthpoints = 10;

         UpdatePlayer.majFinDeTour(p);

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

-        p = new player("Florian", "Grognak le barbare", "ARCHER", 100, new ArrayList<>());

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

         p.currenthealthpoints = 1;

         p.healthpoints = 10;

         UpdatePlayer.majFinDeTour(p);

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

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

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

         p.currenthealthpoints = 1;

         p.healthpoints = 10;

         UpdatePlayer.addXp(p,28);

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

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

         inv.add("Magic Bow");

-        p = new player("Florian", "Grognak le barbare", "ARCHER", 100, inv);

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

         p.currenthealthpoints = 1;

         p.healthpoints = 10;

         UpdatePlayer.majFinDeTour(p);

@@ -180,7 +179,7 @@ public class UnitTests {

         UpdatePlayer.majFinDeTour(p);

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

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

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

         p.currenthealthpoints = 20;

         p.healthpoints = 40;

         UpdatePlayer.majFinDeTour(p);

@@ -195,7 +194,7 @@ public class UnitTests {

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

         inv.add("Holy Elixir");

-        player p = new player("Florian", "Grognak le barbare", "ADVENTURER", 100, inv);

+        Player p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, inv);

         assertEquals("Joueur Grognak le barbare joué par Florian\nNiveau : 1 (XP totale : 0)\n\nCapacités :\n   DEF : 1\n   ATK : 3\n   CHA : 3\n   INT : 2\n\nInventaire :\n   Holy Elixir",  Affichage.afficherJoueur(p));

     }