src/main/java/Action/CastAction.java

@@ -1,11 +1,11 @@
 package Action;
 
-import Job.HasJob;
+import Job.JobHolder;
 import Job.Wizard;
 
 public class CastAction implements Action {
     private Wizard requireWizard(Actor actor) {
-        if (actor instanceof HasJob hasJob && hasJob.getJob() instanceof Wizard wizard) {
+        if (actor instanceof JobHolder hasJob && hasJob.getJob() instanceof Wizard wizard) {
             return wizard;
         }
         throw new IllegalStateException(actor + " cannot perform this action without being a Wizard!");

src/main/java/Action/DigAction.java

@@ -1,6 +1,6 @@
 package Action;
 
-import Job.HasJob;
+import Job.JobHolder;
 import Job.Miner;
 import Terrain.Biome;
 
@@ -16,7 +16,7 @@ public class DigAction implements Action {
     }
 
     private Miner requireMiner(Actor actor) {
-        if (actor instanceof HasJob hasJob
+        if (actor instanceof JobHolder hasJob
                 && hasJob.getJob() instanceof Miner miner) {
             return miner;
         }

src/main/java/Action/LearnSpellAction.java

@@ -1,6 +1,6 @@
 package Action;
 
-import Job.HasJob;
+import Job.JobHolder;
 import Job.Wizard;
 
 public class LearnSpellAction implements Action {
@@ -11,7 +11,7 @@ public class LearnSpellAction implements Action {
     }
 
     private Wizard requireWizard(Actor actor) {
-        if (actor instanceof HasJob hasJob && hasJob.getJob() instanceof Wizard wizard) {
+        if (actor instanceof JobHolder hasJob && hasJob.getJob() instanceof Wizard wizard) {
             return wizard;
         }
         throw new IllegalStateException(actor + " cannot perform this action without being a Wizard!");

src/main/java/Character/HasInventory.java

@@ -1,7 +0,0 @@
-package Character;
-
-import java.util.List;
-
-public interface HasInventory {
-    List<String> getInventory();
-}

src/main/java/Entity/Entity.java

@@ -4,7 +4,7 @@ package Entity;
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class Entity implements HasPosition {
+public abstract class Entity implements Positionable {
     protected String name;
     protected Position position;
     private static final List<Entity> entities = new ArrayList<Entity>();

src/main/java/Entity/Player.java

@@ -8,14 +8,14 @@ import Combat.HasMana;
 import Combat.Spell;
 import Inventory.Inventory;
 import Job.Job;
-import Job.HasJob;
+import Job.JobHolder;
-import Inventory.HasInventory;
+import Inventory.InventoryHolder;
 import Inventory.HasSpellBook;
 
 import java.util.LinkedList;
 import java.util.List;
 
-public class Player extends Entity implements Movable, Actor, HasInventory, HasSpellBook, HasJob, HasHealth, HasMana, HasConditions {
+public class Player extends Entity implements Movable, Actor, InventoryHolder, HasSpellBook, JobHolder, HasHealth, HasMana, HasConditions {
     protected int health;
     protected int mana;
     protected Job job;

src/main/java/Entity/Positionable.java

@@ -1,6 +1,6 @@
 package Entity;
 
-public interface HasPosition {
+public interface Positionable {
     Position getPosition();
     void setPosition(Position position);
 }

src/main/java/Inventory/HasInventory.java

@@ -1,7 +0,0 @@
-package Inventory;
-
-import java.util.List;
-
-public interface HasInventory {
-     Inventory getInventory();
-}

src/main/java/Inventory/InventoryHolder.java

@@ -0,0 +1,5 @@
+package Inventory;
+
+public interface InventoryHolder {
+     Inventory getInventory();
+}

src/main/java/Job/Job.java

@@ -3,8 +3,6 @@ package Job;
 import Shared.ExperienceTable;
 import Shared.Levelable;
 
-import java.util.Objects;
-
 public abstract class Job implements Levelable {
     protected int level;
     protected int experience;
@@ -43,21 +41,4 @@ public abstract class Job implements Levelable {
         level++;
     }
 
-    @Override
-    public String toString() {
-        return String.format("Job: %s. Level: %d", name, level);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        return o != null && getClass() == o.getClass();
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name);
-    }
-
-
 }

src/main/java/Job/JobHolder.java

@@ -1,6 +1,6 @@
 package Job;
 
-public interface HasJob {
+public interface JobHolder {
     Job getJob();
     void learnJob(Job job);
 }

src/main/java/Job/Miner.java

@@ -1,19 +1,19 @@
 package Job;
 
-import Inventory.HasInventory;
+import Inventory.InventoryHolder;
 import Item.ItemStack;
 import Terrain.Biome;
 
 
 public class Miner extends Job {
-    HasInventory actor;
+    InventoryHolder actor;
 
-    public Miner(HasInventory actor) {
+    public Miner(InventoryHolder actor) {
         super("Miner");
         this.actor = actor;
     }
 
-    public HasInventory getActor() {
+    public InventoryHolder getActor() {
         return actor;
     }
 

src/test/java/DigActionTest.java

@@ -0,0 +1,30 @@
+import Action.DigAction;
+import Entity.Player;
+import Job.Miner;
+import Terrain.Biome;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
+
+public class DigActionTest {
+    @Test
+    void can_be_executed_as_miner() {
+        var mockMiner =  mock(Miner.class);
+        var player = mock(Player.class);
+        when(player.getJob()).thenReturn(mockMiner);
+        var biome = mock(Biome.class);
+        var action =  new DigAction(biome);
+        action.execute(player);
+        verify(mockMiner, times(1)).dig(biome);
+    }
+
+    @Test
+    void digging_when_not_miner_throws_error() {
+        var player = mock(Player.class);
+        when(player.getJob()).thenReturn(null);
+        var biome = mock(Biome.class);
+        var action =  new DigAction(biome);
+        assertThrows(IllegalStateException.class, () -> action.execute(player));
+    }
+}