diff --git a/src/main/java/re/forestier/edu/rpg/Object.java b/src/main/java/re/forestier/edu/rpg/Object.java index 1da6e0db6fbdd6169c10fb8c9fdc83cbb11e5412..30dc2b806305a8d73484162afd9846dc2277525f 100644 --- a/src/main/java/re/forestier/edu/rpg/Object.java +++ b/src/main/java/re/forestier/edu/rpg/Object.java @@ -38,9 +38,6 @@ public class Object { return weight; } - public String getDescription() { - return description; - } } diff --git a/src/main/java/re/forestier/edu/rpg/Player.java b/src/main/java/re/forestier/edu/rpg/Player.java index a749743ef0f5f10988cc4229f6b520f8c907ff3b..7bab1788b35e8899617468ffb04ce74d890abcbd 100644 --- a/src/main/java/re/forestier/edu/rpg/Player.java +++ b/src/main/java/re/forestier/edu/rpg/Player.java @@ -118,6 +118,10 @@ public abstract class Player { public void sell(Object object) { + if (!inventory.contains(object)) { + System.out.println("The object " + object.getName() + " is not in the inventory of the player " + playerName); + return; + } inventory.remove(object); money += object.getValue(); currentWeight -= object.getWeight(); diff --git a/src/test/java/re/forestier/edu/UnitTests.java b/src/test/java/re/forestier/edu/UnitTests.java index 187a9c4f3f2647b1007b4b8f123d8741a74e4a79..1768740bba94898fba3927d6cf48cda14b0ca0ce 100644 --- a/src/test/java/re/forestier/edu/UnitTests.java +++ b/src/test/java/re/forestier/edu/UnitTests.java @@ -232,4 +232,22 @@ public class UnitTests { assertThat(player.currentWeight, is(5)); } + + @Test + @DisplayName("Test sell method") + void testSell() { + Adventurer player = new Adventurer("Florian", "Gnognak le Barbare", 200, new ArrayList<>()); + + Object sword = new Object("SWORD", 10, 5, "Epée en bois"); + player.addObject(sword); + + Object shield = new Object("SHIELD", 10, 6, "Bouclier en bois"); + + player.sell(sword); + player.sell(shield); + + assertThat(player.currentWeight, is(0)); + assertThat(player.money, is(210)); + } + }