Avatar_Name -> avatarName, AvatarClass -> avatarClass
Clement COLMERAUER

Clement COLMERAUER commited on 2024-10-24 16:12:41
Showing 18 changed files, with 34 additions and 34 deletions.

... ...
@@ -41,7 +41,7 @@
41 41
 </td>
42 42
 <td>
43 43
 <div class="infoBox" id="duration">
44
-<div class="counter">0.160s</div>
44
+<div class="counter">0.145s</div>
45 45
 <p>duration</p>
46 46
 </div>
47 47
 </td>
... ...
@@ -76,7 +76,7 @@
76 76
 </thead>
77 77
 <tr>
78 78
 <td class="success">testAffichageBase()</td>
79
-<td class="success">0.160s</td>
79
+<td class="success">0.145s</td>
80 80
 <td class="success">passed</td>
81 81
 </tr>
82 82
 </table>
... ...
@@ -89,7 +89,7 @@
89 89
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
90 90
 </label>
91 91
 </div>Generated by 
92
-<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 16:05:59</p>
92
+<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 16:11:48</p>
93 93
 </div>
94 94
 </div>
95 95
 </body>
... ...
@@ -41,7 +41,7 @@
41 41
 </td>
42 42
 <td>
43 43
 <div class="infoBox" id="duration">
44
-<div class="counter">0.028s</div>
44
+<div class="counter">0.026s</div>
45 45
 <p>duration</p>
46 46
 </div>
47 47
 </td>
... ...
@@ -78,7 +78,7 @@
78 78
 <tr>
79 79
 <td class="success">addMoney</td>
80 80
 <td class="success">testAddMoney()</td>
81
-<td class="success">0s</td>
81
+<td class="success">0.001s</td>
82 82
 <td class="success">passed</td>
83 83
 </tr>
84 84
 <tr>
... ...
@@ -114,13 +114,13 @@
114 114
 <tr>
115 115
 <td class="success">removeMoney</td>
116 116
 <td class="success">testRemoveMoney()</td>
117
-<td class="success">0.008s</td>
117
+<td class="success">0.006s</td>
118 118
 <td class="success">passed</td>
119 119
 </tr>
120 120
 <tr>
121 121
 <td class="success">ex &amp; lvl</td>
122 122
 <td class="success">testRetrieveLevel()</td>
123
-<td class="success">0.003s</td>
123
+<td class="success">0.002s</td>
124 124
 <td class="success">passed</td>
125 125
 </tr>
126 126
 <tr>
... ...
@@ -139,7 +139,7 @@
139 139
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
140 140
 </label>
141 141
 </div>Generated by 
142
-<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 16:05:59</p>
142
+<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 16:11:48</p>
143 143
 </div>
144 144
 </div>
145 145
 </body>
... ...
@@ -38,7 +38,7 @@
38 38
 </td>
39 39
 <td>
40 40
 <div class="infoBox" id="duration">
41
-<div class="counter">0.188s</div>
41
+<div class="counter">0.171s</div>
42 42
 <p>duration</p>
43 43
 </div>
44 44
 </td>
... ...
@@ -85,7 +85,7 @@
85 85
 <td>10</td>
86 86
 <td>0</td>
87 87
 <td>0</td>
88
-<td>0.188s</td>
88
+<td>0.171s</td>
89 89
 <td class="success">100%</td>
90 90
 </tr>
91 91
 </tbody>
... ...
@@ -112,7 +112,7 @@
112 112
 <td>1</td>
113 113
 <td>0</td>
114 114
 <td>0</td>
115
-<td>0.160s</td>
115
+<td>0.145s</td>
116 116
 <td class="success">100%</td>
117 117
 </tr>
118 118
 <tr>
... ...
@@ -122,7 +122,7 @@
122 122
 <td>9</td>
123 123
 <td>0</td>
124 124
 <td>0</td>
125
-<td>0.028s</td>
125
+<td>0.026s</td>
126 126
 <td class="success">100%</td>
127 127
 </tr>
128 128
 </tbody>
... ...
@@ -136,7 +136,7 @@
136 136
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
137 137
 </label>
138 138
 </div>Generated by 
139
-<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 16:05:59</p>
139
+<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 16:11:48</p>
140 140
 </div>
141 141
 </div>
142 142
 </body>
... ...
@@ -40,7 +40,7 @@
40 40
 </td>
41 41
 <td>
42 42
 <div class="infoBox" id="duration">
43
-<div class="counter">0.188s</div>
43
+<div class="counter">0.171s</div>
44 44
 <p>duration</p>
45 45
 </div>
46 46
 </td>
... ...
@@ -83,7 +83,7 @@
83 83
 <td>1</td>
84 84
 <td>0</td>
85 85
 <td>0</td>
86
-<td>0.160s</td>
86
+<td>0.145s</td>
87 87
 <td class="success">100%</td>
88 88
 </tr>
89 89
 <tr>
... ...
@@ -93,7 +93,7 @@
93 93
 <td>9</td>
94 94
 <td>0</td>
95 95
 <td>0</td>
96
-<td>0.028s</td>
96
+<td>0.026s</td>
97 97
 <td class="success">100%</td>
98 98
 </tr>
99 99
 </table>
... ...
@@ -106,7 +106,7 @@
106 106
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
107 107
 </label>
108 108
 </div>Generated by 
109
-<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 16:05:59</p>
109
+<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 16:11:48</p>
110 110
 </div>
111 111
 </div>
112 112
 </body>
... ...
@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-10-24T14:05:59" hostname="a206pc27L.local.isima.fr" time="0.16">
2
+<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-10-24T14:11:48" hostname="a206pc27L.local.isima.fr" time="0.145">
3 3
   <properties/>
4
-  <testcase name="testAffichageBase()" classname="re.forestier.edu.GlobalTest" time="0.16"/>
4
+  <testcase name="testAffichageBase()" classname="re.forestier.edu.GlobalTest" time="0.145"/>
5 5
   <system-out><![CDATA[]]></system-out>
6 6
   <system-err><![CDATA[]]></system-err>
7 7
 </testsuite>
... ...
@@ -1,10 +1,10 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<testsuite name="re.forestier.edu.UnitTests" tests="9" skipped="0" failures="0" errors="0" timestamp="2024-10-24T14:05:59" hostname="a206pc27L.local.isima.fr" time="0.034">
2
+<testsuite name="re.forestier.edu.UnitTests" tests="9" skipped="0" failures="0" errors="0" timestamp="2024-10-24T14:11:48" hostname="a206pc27L.local.isima.fr" time="0.033">
3 3
   <properties/>
4 4
   <testcase name="Main" classname="re.forestier.edu.UnitTests" time="0.013"/>
5
-  <testcase name="removeMoney" classname="re.forestier.edu.UnitTests" time="0.008"/>
6
-  <testcase name="ex &amp; lvl" classname="re.forestier.edu.UnitTests" time="0.003"/>
7
-  <testcase name="addMoney" classname="re.forestier.edu.UnitTests" time="0.0"/>
5
+  <testcase name="removeMoney" classname="re.forestier.edu.UnitTests" time="0.006"/>
6
+  <testcase name="ex &amp; lvl" classname="re.forestier.edu.UnitTests" time="0.002"/>
7
+  <testcase name="addMoney" classname="re.forestier.edu.UnitTests" time="0.001"/>
8 8
   <testcase name="Construcor UpdatePlayer" classname="re.forestier.edu.UnitTests" time="0.0"/>
9 9
   <testcase name="majDeFinDeTour" classname="re.forestier.edu.UnitTests" time="0.001"/>
10 10
   <testcase name="Constructor Player" classname="re.forestier.edu.UnitTests" time="0.0"/>
... ...
@@ -10,8 +10,8 @@ public class Player {
10 10
                                                                   //TODO : add level
11 11
 
12 12
     private String playerName;
13
-    private String Avatar_name;
14
-    private String AvatarClass;
13
+    private String avatarName;
14
+    private String avatarClass;
15 15
 
16 16
     private Integer money;
17 17
     private Float __real_money__;
... ...
@@ -31,13 +31,13 @@ public class Player {
31 31
         }
32 32
 
33 33
         this.playerName = playerName;
34
-        Avatar_name = avatar_name;
35
-        AvatarClass = avatarClass;
34
+        this.avatarName = avatar_name;
35
+        this.avatarClass = avatarClass;
36 36
         this.money = Integer.valueOf(money);
37 37
         this.inventory = inventory;
38 38
         this.level = Natural.valueOf(1);
39 39
         this.xp = 0;
40
-        this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(AvatarClass).get(1);
40
+        this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(this.avatarClass).get(1);
41 41
     }
42 42
 
43 43
     public Player(String playerName, String avatar_name, String avatarClass, int money, ArrayList<String> inventory, int maxHp)
... ...
@@ -48,13 +48,13 @@ public class Player {
48 48
         }
49 49
 
50 50
         this.playerName = playerName;
51
-        Avatar_name = avatar_name;
52
-        AvatarClass = avatarClass;
51
+        this.avatarName = avatar_name;
52
+        this.avatarClass = avatarClass;
53 53
         this.money = Integer.valueOf(money);
54 54
         this.inventory = inventory;
55 55
         this.level = Natural.valueOf(1);
56 56
         this.xp = 0;
57
-        this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(AvatarClass).get(1);
57
+        this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(this.avatarClass).get(1);
58 58
         this.maxHealthPoint = Natural.valueOf(maxHp);
59 59
         this.currentHealthPoints = Natural.valueOf(maxHp);
60 60
     }
... ...
@@ -66,7 +66,7 @@ public class Player {
66 66
             
67 67
     public String getAvatarName()
68 68
     {
69
-        return this.Avatar_name;
69
+        return this.avatarName;
70 70
     }
71 71
             
72 72
     public Integer getMoney()
... ...
@@ -123,7 +123,7 @@ public class Player {
123 123
     }
124 124
 
125 125
     public String getAvatarClass () {
126
-        return AvatarClass;
126
+        return this.avatarClass;
127 127
     }
128 128
 
129 129
     public void addXp(int xp) {
... ...
@@ -167,7 +167,7 @@ public class Player {
167 167
     public String toString()
168 168
     {
169 169
         StringBuilder sb = new StringBuilder("Joueur ");
170
-        sb.append(this.Avatar_name);
170
+        sb.append(this.avatarName);
171 171
         sb.append(" joué par ");
172 172
         sb.append(this.playerName);
173 173
         sb.append("\nNiveau : ");
174 174