Skip to content
This repository was archived by the owner on May 25, 2021. It is now read-only.

Commit 30893f6

Browse files
committed
Remove remaining system.out and correct some tests due to change
1 parent 75e457f commit 30893f6

2 files changed

Lines changed: 1 addition & 23 deletions

File tree

  • src
    • main/java/fr/univ_amu/heromanager/model/job
    • test/java/fr/univ_amu/heromanager/model/job

src/main/java/fr/univ_amu/heromanager/model/job/Job.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ public void setLevel(int level) {
194194
public int getProficiencyLevel() {
195195

196196
double proficiency = 1 + ((double) level / 4);
197-
System.out.println(proficiency);
198197
return (int) Math.ceil(proficiency);
199198

200199
}

src/test/java/fr/univ_amu/heromanager/model/job/JobTest.java

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,7 @@ public void getStrengthTest() {
163163

164164
assertEquals(wantedBaseStr14, alreadyExistingBard.getStrength());
165165

166-
alreadyExistingBard.increaseStrength(); // not increasing because alreadyExistingBard have 0 stats points
167-
assertNotEquals(wantedBaseStr15, alreadyExistingBard.getStrength());
168166

169-
alreadyExistingBard.setAdditionalStatPoints(1);
170167
alreadyExistingBard.increaseStrength();
171168

172169
assertEquals(wantedBaseStr15, alreadyExistingBard.getStrength());
@@ -216,10 +213,7 @@ public void getDexterityTest() {
216213
int wantedDex14 = 14;
217214
assertEquals(wantedDex13, alreadyExistingBard.getDexterity());
218215

219-
alreadyExistingBard.increaseDexterity(); // not increasing because alreadyExistingBard have 0 stats points
220-
assertNotEquals(wantedDex14, alreadyExistingBard.getDexterity());
221216

222-
alreadyExistingBard.setAdditionalStatPoints(1);
223217
alreadyExistingBard.increaseDexterity();
224218

225219
assertEquals(wantedDex14, alreadyExistingBard.getDexterity());
@@ -258,10 +252,6 @@ public void getRobustnessTest() {
258252
int wantedRob12 = 12;
259253
assertEquals(wantedRob11, alreadyExistingBard.getRobustness());
260254

261-
alreadyExistingBard.increaseRobustness(); // not increasing because alreadyExistingBard have 0 stats points
262-
assertNotEquals(wantedRob12, alreadyExistingBard.getRobustness());
263-
264-
alreadyExistingBard.setAdditionalStatPoints(1);
265255
alreadyExistingBard.increaseRobustness();
266256

267257
assertEquals(wantedRob12, alreadyExistingBard.getRobustness());
@@ -300,10 +290,7 @@ public void getIntelligenceTest() {
300290
int wantedInt13 = 13;
301291
assertEquals(wantedInt12, alreadyExistingBard.getIntelligence());
302292

303-
alreadyExistingBard.increaseIntelligence(); // not increasing because alreadyExistingBard have 0 stats points
304-
assertNotEquals(wantedInt13, alreadyExistingBard.getIntelligence());
305293

306-
alreadyExistingBard.setAdditionalStatPoints(1);
307294
alreadyExistingBard.increaseIntelligence();
308295

309296
assertEquals(wantedInt13, alreadyExistingBard.getIntelligence());
@@ -342,10 +329,7 @@ public void getWisdomTest() {
342329
int wantedWisdom11 = 11;
343330
assertEquals(wantedWisdom10, alreadyExistingBard.getWisdom());
344331

345-
alreadyExistingBard.increaseWisdom(); // not increasing because alreadyExistingBard have 0 stats points
346-
assertNotEquals(wantedWisdom11, alreadyExistingBard.getWisdom());
347332

348-
alreadyExistingBard.setAdditionalStatPoints(1);
349333
alreadyExistingBard.increaseWisdom();
350334

351335
assertEquals(wantedWisdom11, alreadyExistingBard.getWisdom());
@@ -385,10 +369,7 @@ public void getCharismaTest() {
385369
int wantedCha10 = 10;
386370
assertEquals(wantedCha9, alreadyExistingBard.getCharisma());
387371

388-
alreadyExistingBard.increaseCharisma(); // not increasing because alreadyExistingBard have 0 stats points
389-
assertNotEquals(wantedCha10, alreadyExistingBard.getCharisma());
390372

391-
alreadyExistingBard.setAdditionalStatPoints(1);
392373
alreadyExistingBard.increaseCharisma();
393374

394375
assertEquals(wantedCha10, alreadyExistingBard.getCharisma());
@@ -615,8 +596,6 @@ public void equippedInventoryTest(){
615596

616597
alreadyExistingBard.replaceLeftRing(otherRing);
617598

618-
System.out.println(alreadyExistingBard.getEquippedEquipments().getRightRing());
619-
System.out.println(alreadyExistingBard.getEquippedEquipments().getLeftRing());
620599
assertSame(alreadyExistingBard.getEquippedEquipments().getLeftRing(), otherRing);
621600
assertTrue(alreadyExistingBard.getInventory().contains(ring));
622601
assertFalse(alreadyExistingBard.getInventory().contains(otherRing));
@@ -637,7 +616,7 @@ public void getEquipmentTest() throws UnsupportedItemException {
637616
assertEquals(ring,alreadyExistingBard.getEquipment(equipmentPartRing));
638617
assertEquals(otherRing,alreadyExistingBard.getEquipment(equipmentPartRing2));
639618

640-
assertThrows(UnsupportedItemException.class, () -> alreadyExistingBard.getEquipment(null));
619+
assertThrows(NullPointerException.class, () -> alreadyExistingBard.getEquipment(null));
641620

642621

643622
}

0 commit comments

Comments
 (0)