diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LayerTests.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LayerTests.java index c5e0c22786..e43d51ce72 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LayerTests.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LayerTests.java @@ -60,7 +60,8 @@ public class LayerTests extends CardTestPlayerBase { assertType("Plains", CardType.LAND, SubType.PLAINS); } - + + @Test @Ignore //Works fine in the game. Test fails, though. public void complexExampleFromLayersArticle() { /*In play there is a Grizzly Bears which has already been Giant Growthed, @@ -116,7 +117,8 @@ public class LayerTests extends CardTestPlayerBase { assertPowerToughness(playerA, "Urborg, Tomb of Yawgmoth", 0, 1); // Urborg is a 0/1 creature } - + + @Test @Ignore //This works fine in the game. Test fails. public void testFromAnArticle() { /* diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/TreeOfPerditionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/TreeOfPerditionTest.java index bc885b59f0..dc342355c1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/TreeOfPerditionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/TreeOfPerditionTest.java @@ -26,6 +26,7 @@ public class TreeOfPerditionTest extends CardTestPlayerBase { /* Tree of Perdition - {3}{B} - Creature Plant - 0/13 + {T}: Exchange target opponent’s life total with Tree of Perdition’s toughness. Defender Tap: Exchange target opponent's life total with Tree of Perdition's toughness. */ @@ -34,7 +35,7 @@ public class TreeOfPerditionTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Unsummon", 1); // {U} instant - return target creature to owner hand addCard(Zone.BATTLEFIELD,playerB,"Island",1); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Exchange"); addTarget(playerA, playerB); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Unsummon"); @@ -65,7 +66,7 @@ public class TreeOfPerditionTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Tree of Perdition"); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Exchange"); addTarget(playerA, playerB); setStopAt(1, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodCultistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodCultistTest.java index 28235a5896..9e2c8f3a4b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodCultistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodCultistTest.java @@ -49,7 +49,7 @@ public class BloodCultistTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Devilthorn Fox", 1); // 3/1 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blood Cultist"); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:", "Devilthorn Fox"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals", "Devilthorn Fox"); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); @@ -72,7 +72,7 @@ public class BloodCultistTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Indulgent Aristocrat", 1); // 1/1 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blood Cultist"); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:", "Devilthorn Fox"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals", "Devilthorn Fox"); attack(5, playerA, "Blood Cultist"); block(5, playerB, "Indulgent Aristocrat", "Blood Cultist"); @@ -99,8 +99,8 @@ public class BloodCultistTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Shambling Ghoul", 1); // 2/3 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blood Cultist"); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:", "Devilthorn Fox"); - activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:", "Shambling Ghoul"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals", "Devilthorn Fox"); + activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals", "Shambling Ghoul"); attack(5, playerA, "Silvercoat Lion"); block(5, playerB, "Shambling Ghoul", "Silvercoat Lion"); @@ -127,8 +127,8 @@ public class BloodCultistTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Shambling Ghoul", 1); // 2/3 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blood Cultist"); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:", "Devilthorn Fox"); - activateAbility(5, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}:", "Shambling Ghoul"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals", "Devilthorn Fox"); + activateAbility(5, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: {source} deals", "Shambling Ghoul"); attack(5, playerA, "Silvercoat Lion"); block(5, playerB, "Shambling Ghoul", "Silvercoat Lion"); @@ -153,7 +153,7 @@ public class BloodCultistTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Shambling Ghoul", 1); // 2/3 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blood Cultist"); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}:", "Shambling Ghoul"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: {source} deals", "Shambling Ghoul"); castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Shambling Ghoul"); setStopAt(3, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java b/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java index 259b307789..98d56aa228 100644 --- a/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java @@ -124,7 +124,7 @@ public class GameIsADrawTest extends CardTestPlayerBase { setChoice(playerA, "PlayerA"); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Stuffy Doll"); - activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}"); + activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: {source} deals"); setStopAt(3, PhaseStep.END_TURN); execute();