From bfb2b07ba62b40a9161224e68d54391a03b81406 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Wed, 22 Mar 2017 13:09:49 -0300 Subject: [PATCH] Create unit tests --- Mage.Sets/src/mage/cards/c/CitadelOfPain.java | 11 ++++++-- .../oneshot/damage/CitadelOfPainTest.java | 25 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java diff --git a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java index 86c9ece906d..8d03fc18e8b 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java +++ b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java @@ -30,6 +30,7 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.Ability; +import mage.abilities.Mode; import mage.abilities.TriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.Effect; @@ -55,7 +56,8 @@ public class CitadelOfPain extends CardImpl { public CitadelOfPain(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); - TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, + TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, + "beginning of the end step", true, new CitadelOfPainEffect()); // At the beginning of each player's end step, Citadel of Pain deals X damage to that player, where X is the number of untapped lands he or she controls. this.addAbility(triggered); @@ -75,6 +77,11 @@ class CitadelOfPainEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterControlledLandPermanent(); + @Override + public String getText(Mode mode) { + return "{this} deals X damage to that player, where X is the number of untapped lands he or she controls."; + } + static { filter.add(Predicates.not(new TappedPredicate())); } @@ -89,7 +96,7 @@ class CitadelOfPainEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(game.getActivePlayerId()); if (player != null) { int damage = game.getBattlefield().countAll(filter, game.getActivePlayerId(), game); player.damage(damage, source.getSourceId(), game, false, true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java new file mode 100644 index 00000000000..cf972d5a939 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java @@ -0,0 +1,25 @@ +package org.mage.test.cards.abilities.oneshot.damage; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * Created by Alexsandr0x. + */ +public class CitadelOfPainTest extends CardTestPlayerBase { + + @Test + public void testDamage() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + // At the beginning of each player's end step, Citadel of Pain deals X damage to that + // player, where X is the number of untapped lands he or she controls. + addCard(Zone.BATTLEFIELD, playerA, "Citadel of Pain"); + + setStopAt(3, PhaseStep.END_TURN); + execute(); + + assertLife(playerA, 17); + } +}