Kata refactoring

Changement attribut simple de player en privé
Parent 2a30c88
Clement COLMERAUER

Clement COLMERAUER commited on 2024-10-04 17:07:46
Showing 3 changed files, with 58 additions and 58 deletions.

src/main/javre/forestier/edu/rpg/Affichage.java
View file @ a219658
... ... 
@@ -3,8 +3,8 @@ package re.forestier.edu.rpg;
3 3 
 public class Affichage {
4 4
5 5 
     public static String afficherJoueur(Player player) {
6 
-        final String[] finalString = {"Joueur " + player.Avatar_name + " joué par " + player.playerName};
7 
-        finalString[0] += "\nNiveau : " + player.retrieveLevel() + " (XP totale : " + player.xp + ")";
6 
+        final String[] finalString = {"Joueur " + player.getAvatarName() + " joué par " + player.getPlayerName()};
7 
+        finalString[0] += "\nNiveau : " + player.retrieveLevel() + " (XP totale : " + player.getXp() + ")";
8 8 
         finalString[0] += "\n\nCapacités :";
9 9 
         player.abilities.forEach((name, level) -> {
10 10 
             finalString[0] += "\n   " + name + " : " + level;
src/main/javre/forestier/edu/rpg/UpdatePlayer.java
View file @ a219658
... ... 
@@ -100,7 +100,7 @@ public class UpdatePlayer {
100 100
101 101 
     public static boolean addXp(Player player, int xp) {
102 102 
         int currentLevel = player.retrieveLevel();
103 
-        player.xp += xp;
103 
+        player.setXp(player.getXp()+xp);
104 104 
         int newLevel = player.retrieveLevel();
105 105
106 106 
         if (newLevel != currentLevel) {
... ... 
@@ -124,45 +124,45 @@ public class UpdatePlayer {
124 124
125 125 
     // majFinDeTour met à jour les points de vie
126 126 
     public static void majFinDeTour(Player player) {
127 
-        if(player.currenthealthpoints == 0) {
127 
+        if(player.getCurrentHealthPoints() == 0) {
128 128 
             System.out.println("Le joueur est KO !");
129 129 
             return;
130 130 
         }
131 131
132 
-        if(player.currenthealthpoints < player.healthpoints/2) {
132 
+        if(player.getCurrentHealthPoints() < player.getHealthPoints()/2) {
133 133 
             if(!player.getAvatarClass().equals("ADVENTURER")) {
134 134 
                 if(player.getAvatarClass().equals("DWARF")) {
135 135 
                     if(player.inventory.contains("Holy Elixir")) {
136 
-                        player.currenthealthpoints+=1;
136 
+                        player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
137 137 
                     }
138 
-                    player.currenthealthpoints+=1;
138 
+                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
139 139 
                 } else if(player.getAvatarClass().equals("ADVENTURER")) {
140 
-                    player.currenthealthpoints+=2;
140 
+                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()+2);
141 141 
                 }
142 142
143 143
144 144 
                 if(player.getAvatarClass().equals("ARCHER")) {
145 
-                    player.currenthealthpoints+=1;
145 
+                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
146 146 
                     if(player.inventory.contains("Magic Bow")) {
147 
-                        player.currenthealthpoints+=player.currenthealthpoints/8-1;
147 
+                        player.setCurrentHealthPoints(player.getCurrentHealthPoints()+player.getCurrentHealthPoints()/8-1);
148 148 
                     }
149 149 
                 }
150 150 
             } else {
151 
-                player.currenthealthpoints+=2;
151 
+                player.setCurrentHealthPoints(player.getCurrentHealthPoints()+2);
152 152 
                 if(player.retrieveLevel() < 3) {
153 
-                    player.currenthealthpoints-=1;
153 
+                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()-1);
154 154 
                 }
155 155 
             }
156 
-        } else if(player.currenthealthpoints >= player.healthpoints/2){
157 
-            if(player.currenthealthpoints >= player.healthpoints) {
158 
-                player.currenthealthpoints = player.healthpoints;
156 
+        } else if(player.getCurrentHealthPoints() >= player.getHealthPoints()/2){
157 
+            if(player.getCurrentHealthPoints() >= player.getHealthPoints()) {
158 
+                player.setCurrentHealthPoints(player.getHealthPoints());
159 159 
                 return;
160 160 
             }
161 161 
         }
162 162
163 163
164 
-        if(player.currenthealthpoints >= player.healthpoints) {
165 
-            player.currenthealthpoints = player.healthpoints;
164 
+        if(player.getCurrentHealthPoints() >= player.getHealthPoints()) {
165 
+            player.setCurrentHealthPoints(player.getHealthPoints());
166 166 
         }
167 167 
     }
168 168
src/test/javre/forestier/edu/UnitTests.java
View file @ a219658
... ... 
@@ -34,7 +34,7 @@ public class UnitTests {
34 34 
     @DisplayName("Sample test")
35 35 
     void testPlayerName() {
36 36 
         Player Player = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());
37 
-        assertThat(Player.playerName, is("Florian"));
37 
+        assertThat(Player.getPlayerName(), is("Florian"));
38 38
39 39 
     }
40 40
... ... 
@@ -43,13 +43,13 @@ public class UnitTests {
43 43 
     void testPlayerConstructor()
44 44 
     {
45 45 
         Player p = new Player("Florian", "Grognak le barbare", "jgn", 100, new ArrayList<>());
46 
-        assertThat(p.playerName, not("Florian"));
46 
+        assertThat(p.getPlayerName(), not("Florian"));
47 47 
         p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());
48 
-        assertThat(p.playerName, is("Florian"));
48 
+        assertThat(p.getPlayerName(), is("Florian"));
49 49 
         p = new Player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>());
50 
-        assertThat(p.playerName, is("Florian"));
50 
+        assertThat(p.getPlayerName(), is("Florian"));
51 51 
         p = new Player("Florian", "Grognak le barbare", "ARCHER", 100, new ArrayList<>());
52 
-        assertThat(p.playerName, is("Florian"));
52 
+        assertThat(p.getPlayerName(), is("Florian"));
53 53 
     }
54 54
55 55 
     @Test
... ... 
@@ -59,10 +59,10 @@ public class UnitTests {
59 59
60 60 
         assertThrows(IllegalArgumentException.class, () -> p.removeMoney(200));
61 61 
         p.removeMoney(50);
62 
-        assertThat(p.money, is(50));
63 
-        assertThat(p.money, not(150));
62 
+        assertThat(p.getMoney(), is(50));
63 
+        assertThat(p.getMoney(), not(150));
64 64 
         p.removeMoney(50);
65 
-        assertThat(p.money, is(0));
65 
+        assertThat(p.getMoney(), is(0));
66 66 
     }
67 67
68 68 
     @Test
... ... 
@@ -70,7 +70,7 @@ public class UnitTests {
70 70 
     void testAddMoney() {
71 71 
         Player p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());
72 72 
         p.addMoney(50);
73 
-        assertThat(p.money, is(150));
73 
+        assertThat(p.getMoney(), is(150));
74 74 
     }
75 75
76 76 
     @Test
... ... 
@@ -119,71 +119,71 @@ public class UnitTests {
119 119 
     @DisplayName("majDeFinDeTour")
120 120 
     void testMajFinTour() {
121 121 
         Player p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());
122 
-        p.currenthealthpoints = 0;
122 
+        p.setCurrentHealthPoints(0);
123 123 
         UpdatePlayer.majFinDeTour(p);
124 124 
         assertEquals("Le joueur est KO !", outContent.toString().trim());
125 
-        p.currenthealthpoints = 1;
126 
-        p.healthpoints = 10;
125 
+        p.setCurrentHealthPoints(1);
126 
+        p.setHealthPoints(10);
127 127 
         UpdatePlayer.majFinDeTour(p);
128 
-        assertThat(p.currenthealthpoints,is(2));
128 
+        assertThat(p.getCurrentHealthPoints(),is(2));
129 129 
         boolean b = UpdatePlayer.addXp(p,100);
130 130 
         UpdatePlayer.majFinDeTour(p);
131 
-        p.currenthealthpoints = 9;
131 
+        p.setCurrentHealthPoints(9);
132 132 
         UpdatePlayer.majFinDeTour(p);
133 
-        assertThat(p.currenthealthpoints,is(9));
134 
-        p.currenthealthpoints = 11;
133 
+        assertThat(p.getCurrentHealthPoints(),is(9));
134 
+        p.setCurrentHealthPoints(11);
135 135 
         UpdatePlayer.majFinDeTour(p);
136 
-        assertThat(p.currenthealthpoints,is(p.healthpoints));
136 
+        assertThat(p.getCurrentHealthPoints(),is(p.getHealthPoints()));
137 137
138 138 
         p = new Player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>());
139 
-        p.currenthealthpoints = 1;
140 
-        p.healthpoints = 10;
139 
+        p.setCurrentHealthPoints(1);
140 
+        p.setHealthPoints(10);
141 141 
         UpdatePlayer.majFinDeTour(p);
142 
-        assertThat(p.currenthealthpoints,is(2));
142 
+        assertThat(p.getCurrentHealthPoints(),is(2));
143 143
144 144 
         p = new Player("Florian", "Grognak le barbare", "DWARF", 100, new ArrayList<>());
145 
-        p.currenthealthpoints = 5;
146 
-        p.healthpoints = 10;
145 
+        p.setCurrentHealthPoints(5);
146 
+        p.setHealthPoints(10);
147 147 
         UpdatePlayer.majFinDeTour(p);
148 
-        assertThat(p.currenthealthpoints,is(5));
148 
+        assertThat(p.getCurrentHealthPoints(),is(5));
149 149
150 150 
         ArrayList<String> inv = new ArrayList<String>();
151 151 
         inv.add("Holy Elixir");
152 152 
         p = new Player("Florian", "Grognak le barbare", "DWARF", 100, inv);
153 
-        p.currenthealthpoints = 1;
154 
-        p.healthpoints = 10;
153 
+        p.setCurrentHealthPoints(1);
154 
+        p.setHealthPoints(10);
155 155 
         UpdatePlayer.majFinDeTour(p);
156 
-        assertThat(p.currenthealthpoints,is(3));
156 
+        assertThat(p.getCurrentHealthPoints(),is(3));
157 157
158 158 
         p = new Player("Florian", "Grognak le barbare", "ARCHER", 100, new ArrayList<>());
159 
-        p.currenthealthpoints = 1;
160 
-        p.healthpoints = 10;
159 
+        p.setCurrentHealthPoints(1);
160 
+        p.setHealthPoints(10);
161 161 
         UpdatePlayer.majFinDeTour(p);
162 
-        assertThat(p.currenthealthpoints,is(2));
162 
+        assertThat(p.getCurrentHealthPoints(),is(2));
163 163
164 164 
         p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());
165 
-        p.currenthealthpoints = 1;
166 
-        p.healthpoints = 10;
165 
+        p.setCurrentHealthPoints(1);
166 
+        p.setHealthPoints(10);
167 167 
         UpdatePlayer.addXp(p,28);
168 168 
         UpdatePlayer.majFinDeTour(p);
169 
-        assertThat(p.currenthealthpoints,is(3));
169 
+        assertThat(p.getCurrentHealthPoints(),is(3));
170 170
171 171 
         inv.add("Magic Bow");
172 172 
         p = new Player("Florian", "Grognak le barbare", "ARCHER", 100, inv);
173 
-        p.currenthealthpoints = 1;
174 
-        p.healthpoints = 10;
173 
+        p.setCurrentHealthPoints(1);
174 
+        p.setHealthPoints(10);
175 175 
         UpdatePlayer.majFinDeTour(p);
176 
-        assertThat(p.currenthealthpoints,is(1));
177 
-        p.currenthealthpoints = 16;
178 
-        p.healthpoints = 40;
176 
+        assertThat(p.getCurrentHealthPoints(),is(1));
177 
+        p.setCurrentHealthPoints(16);
178 
+        p.setHealthPoints(40);
179 179 
         UpdatePlayer.majFinDeTour(p);
180 
-        assertThat(p.currenthealthpoints,is(17 + 17/8-1));
180 
+        assertThat(p.getCurrentHealthPoints(),is(17 + 17/8-1));
181 181
182 182 
         p = new Player("Florian", "Grognak le barbare", "ADVENTURER", 100, new ArrayList<>());
183 
-        p.currenthealthpoints = 20;
184 
-        p.healthpoints = 40;
183 
+        p.setCurrentHealthPoints(20);
184 
+        p.setHealthPoints(40);
185 185 
         UpdatePlayer.majFinDeTour(p);
186 
-        assertEquals(p.currenthealthpoints,20);
186 
+        assertEquals(p.getCurrentHealthPoints(),20);
187 187 
     }
188 188
189 189 
     @Test
190 190