Fix: Building13, Building0Test, Building13Test, BuildingCard, BuildingCarsTest
This commit is contained in:
@@ -20,8 +20,5 @@ public class Building13 extends BuildingCard{
|
|||||||
throw new IllegalArgumentException();
|
throw new IllegalArgumentException();
|
||||||
player.addPrestige(25);
|
player.addPrestige(25);
|
||||||
}
|
}
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "Era:"+String.valueOf(getEra())+"\nPrice:"+String.valueOf(getPrice())+"\nPrestige:"+String.valueOf(getPrestigeValue()+"\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,4 +86,9 @@ public class BuildingCard extends PlayableCard implements Cloneable , BuildingEf
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
public void applyEffect(Player player){};
|
public void applyEffect(Player player){};
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "Era:"+String.valueOf(getEra())+"\nPrice:"+String.valueOf(getPrice())+"\nPrestige:"+String.valueOf(getPrestigeValue()+"\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package it.polimi.ingsw.gc14.Model.Cards.Building.Effects;
|
|||||||
import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType;
|
import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType;
|
||||||
import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*;
|
import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*;
|
||||||
import it.polimi.ingsw.gc14.Model.Player;
|
import it.polimi.ingsw.gc14.Model.Player;
|
||||||
import jdk.jshell.spi.SPIResolutionException;
|
|
||||||
import org.junit.jupiter.api.DisplayName;
|
import org.junit.jupiter.api.DisplayName;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
|||||||
@@ -69,12 +69,4 @@ class Building13Test {
|
|||||||
b13.buy(p1);
|
b13.buy(p1);
|
||||||
assertFalse(b13.buy(p2));
|
assertFalse(b13.buy(p2));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
@DisplayName("Testing toString method")
|
|
||||||
void testToString() {
|
|
||||||
Building13 b0 = new Building13(1, 2,3);
|
|
||||||
|
|
||||||
assertEquals("Era:1\nPrice:2\nPrestige:3\n", b0.toString());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -2,6 +2,7 @@ package it.polimi.ingsw.gc14.Model.Cards;
|
|||||||
|
|
||||||
import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType;
|
import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType;
|
||||||
import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.Building0;
|
import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.Building0;
|
||||||
|
import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.Building13;
|
||||||
import it.polimi.ingsw.gc14.Model.Player;
|
import it.polimi.ingsw.gc14.Model.Player;
|
||||||
import org.junit.jupiter.api.DisplayName;
|
import org.junit.jupiter.api.DisplayName;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -148,4 +149,12 @@ class BuildingCardTest {
|
|||||||
assertEquals(false, bc0.buy(p1));
|
assertEquals(false, bc0.buy(p1));
|
||||||
assertEquals(false, bc0.buy(p2));
|
assertEquals(false, bc0.buy(p2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("Testing toString method")
|
||||||
|
void testToString() {
|
||||||
|
Building13 b0 = new Building13(1, 2,3);
|
||||||
|
|
||||||
|
assertEquals("Era:1\nPrice:2\nPrestige:3\n", b0.toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user