Merge pull request #41 from rubenpirreram/tests-fix

tests-fix

src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java

@@ -62,7 +62,7 @@ public abstract class EventCard extends TribeCard {
      */
     @Override
     public String toString() {
-        return super.toString()+" "+type.toString();
+        return super.toString()+", "+type.toString();
     }
 
     /**

src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java

@@ -70,4 +70,5 @@ public class Hunt extends EventCard {
     public EventCard clone() {
         return new Hunt(getEra(), prestigeMultiplier);
     }
+
 }

src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java

@@ -63,6 +63,11 @@ public class Board implements Serializable {
         return this.tribeDeck.size();
     }
 
+    /**
+     * @return the game era
+     */
+    public int getEra() {return this.era;}
+
 
     /**
      *  Creates and initializes a new board:
@@ -234,7 +239,7 @@ public class Board implements Serializable {
                 upperListBuilding.addAll( buildingCards.subList(0,3));
             }
         }
-        else if(era==3)
+        else    // Era 3
         {
             if(nTotem==2)
             {

src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java

@@ -13,7 +13,7 @@ public class Order2 extends OrderLogicCard  {
      * @param players the list of players associated with this order card.
      * @throws NoSuchElementException if the number of players is not equal to 2.
      */
-    public Order2(ArrayList<Player> players)throws NoSuchElementException {
+    public Order2(ArrayList<Player> players) throws NoSuchElementException {
         if(players.size()!=2)
             throw new NoSuchElementException();
         super(players);