Move around some terrain class (and its test) so we can add a dummy

harvestable terrain

src/main/java/com/fundynamic/d2tm/game/state/PlayingState.java

@@ -1,6 +1,5 @@
 package com.fundynamic.d2tm.game.state;
 
-import com.fundynamic.d2tm.*;
 import com.fundynamic.d2tm.Game;
 import com.fundynamic.d2tm.game.controls.Mouse;
 import com.fundynamic.d2tm.game.entities.Entity;
@@ -30,6 +29,7 @@
 import org.newdawn.slick.state.StateBasedGame;
 
 import static com.fundynamic.d2tm.Game.*;
+import static com.fundynamic.d2tm.game.entities.entitiesdata.EntitiesData.HARVESTER;
 
 public class PlayingState extends BasicGameState {
 
@@ -192,10 +192,12 @@ public void initializeMap(EntityRepository entityRepository, Player human, Playe
 
         // TODO: read from SCENARIO.INI file
         // human entities
-        entityRepository.placeUnitOnMap(MapCoordinate.create(2, 2), "HARVESTER", human);
+        entityRepository.placeUnitOnMap(MapCoordinate.create(2, 2), HARVESTER, human);
+        entityRepository.placeUnitOnMap(MapCoordinate.create(3, 2), "QUAD", human);
         entityRepository.placeStructureOnMap(MapCoordinate.create(5, 5), EntitiesData.CONSTRUCTION_YARD, human);
 
         // cpu entities
+//        entityRepository.placeUnitOnMap(MapCoordinate.create(3, 3), "QUAD", cpu);
         entityRepository.placeStructureOnMap(MapCoordinate.create(57, 57), EntitiesData.CONSTRUCTION_YARD, cpu);
     }
 

src/test/java/com/fundynamic/d2tm/game/terrain/EmptyTerrainTest.java → src/test/java/com/fundynamic/d2tm/game/terrain/impl/EmptyTerrainTest.java

@@ -1,6 +1,6 @@
-package com.fundynamic.d2tm.game.terrain;
+package com.fundynamic.d2tm.game.terrain.impl;
 
-import com.fundynamic.d2tm.game.terrain.impl.EmptyTerrain;
+import com.fundynamic.d2tm.game.terrain.Terrain;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;

src/test/java/com/fundynamic/d2tm/game/terrain/impl/HarvestableTerrain.java

@@ -0,0 +1,22 @@
+package com.fundynamic.d2tm.game.terrain.impl;
+
+import com.fundynamic.d2tm.game.terrain.Harvestable;
+import org.newdawn.slick.Image;
+
+/**
+ * A stub for harvestable terrain used for testing purposes
+ */
+public class HarvestableTerrain extends EmptyTerrain implements Harvestable {
+
+    private int amount;
+
+    public HarvestableTerrain(Image image, int amount) {
+        super(image);
+        this.amount = amount;
+    }
+
+    @Override
+    public int harvest(int amount) {
+        return this.amount -= amount;
+    }
+}