src/main/java/Item/BodyArmour.java

@@ -20,6 +20,6 @@ public class BodyArmour extends EquipmentType{
 
     @Override
     public String toString() {
-        return "" + modifiers;
+        return name + modifiers;
     }
 }

src/main/java/Item/Equipment.java

@@ -51,8 +51,5 @@ public class Equipment implements Item {
         return name.equals(e.getName()) && equipmentType.toString().equals(e.getEquipmentType().toString());
     }
 
-    @Override
+
-    public String toString() {
-        return name + equipmentType + slot;
-    }
 }

src/main/java/Item/MageHat.java

@@ -20,6 +20,6 @@ public class MageHat extends EquipmentType{
 
     @Override
     public String toString() {
-        return "" + modifiers;
+        return name + modifiers;
     }
 }

src/test/java/EquipmentTest.java

@@ -28,6 +28,11 @@ public class EquipmentTest {
         return new Equipment("6", "Deathmage Cap", b, wizard, 1);
     }
 
+    @Test
+    void setIdOnCreation(){
+        var e = defaultBodyArmour();
+        assertEquals(defaultBodyArmour().getId(), e.getId(), "Equipment id should have been set");
+    }
 
     @Test
     void setNameOnCreation() {
@@ -36,11 +41,23 @@ public class EquipmentTest {
     }
 
     @Test
-    void setTypeOnCreation() {
+    void setEquipmentWeightOnCreation() {
+        var e = defaultBodyArmour();
+        assertEquals(defaultBodyArmour().getWeight(), e.getWeight(), "Equipment weight should have been set");
+    }
+
+    @Test
+    void setBodyArmourTypeOnCreation() {
         var e = defaultBodyArmour();
         assertEquals("Body Armour", e.getEquipmentType().getName(), "Equipment type should have been set");
     }
 
+    @Test
+    void setMageHatTypeOnCreation() {
+        var e = defaultMageHat();
+        assertEquals("Mage Hat", e.getEquipmentType().getName(), "Equipment type should have been set");
+    }
+
     @Test
     void setSlotOnCreation() {
         var e = defaultBodyArmour();
@@ -112,21 +129,63 @@ public class EquipmentTest {
                 () -> p.equip(e)
         );
         assertTrue(exception.getMessage().contains("Equipment slot already filled"));
-
     }
 
     @Test
-    void equipmentModifiesPlayerStats() {
+    void bodyArmourToString() {
+        AttributeModifier a = new AttributeModifier(1,1,1,1,1,1);
+        BodyArmour b = new BodyArmour("Body Armour", a);
+        assertEquals("Body Armour111122", b.toString(), "Equipment name should have been set");
+    }
+
+    @Test
+    void mageHatToString() {
+        AttributeModifier a = new AttributeModifier(1,1,1,1,1,1);
+        MageHat b = new MageHat("Mage Hat", a);
+        assertEquals("Mage Hat111212", b.toString(), "Equipment name should have been set");
+    }
+
+    @Test
+    void equipmentModifiesPlayerHealth() {
         var p = defaultWizard();
         p.setHealth(100);
-        p.setMana(30);
         p.equip(defaultMageHat());
         assertEquals(104, p.getHealth(), "Equipment modifies health");
+    }
+
+    @Test
+    void equipmentModifiesPlayerMana() {
+        var p = defaultWizard();
+        p.setMana(30);
+        p.equip(defaultMageHat());
         assertEquals(38, p.getMana(),  "Equipment modifies mana");
+    }
+
+    @Test
+    void equipmentModifiesPlayerStrength() {
+        var p = defaultWizard();
+        p.equip(defaultMageHat());
         assertEquals(2, p.getStrength(),  "Equipment modifies strength");
+    }
+
+    @Test
+    void equipmentModifiesPlayerMagicStrength() {
+        var p = defaultWizard();
+        p.equip(defaultMageHat());
         assertEquals(20, p.getMagicStrength(),  "Equipment modifies magic strength");
+    }
+
+    @Test
+    void equipmentModifiesPlayerDefence() {
+        var p = defaultWizard();
+        p.equip(defaultMageHat());
         assertEquals(2, p.getDefence(),  "Equipment modifies defence");
-        assertEquals(16, p.getMagicDefence() , "Equipment modifies magic defence");
+    }
+
+    @Test
+    void equipmentModifiesPlayerMagicDefence() {
+        var p = defaultWizard();
+        p.equip(defaultMageHat());assertEquals(16, p.getMagicDefence() , "Equipment modifies magic defence");
     }