From ebc6362279bc91119e64ae4580310393466ee589 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 16 Apr 2018 19:21:30 -0400 Subject: [PATCH] fixed some tests --- .../test/cards/planeswalker/GideonTest.java | 6 ++-- .../test/cards/planeswalker/TamiyoTest.java | 2 +- .../cards/single/ChandraPyromasterTest.java | 32 +++++++++---------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java index c139dae7fd1..700b59deb68 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java @@ -101,11 +101,11 @@ public class GideonTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Gideon, Champion of Justice"); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Until end of turn"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "0: Until end of turn"); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Put a loyalty counter on", playerB); - activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Until end of turn"); + activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "0: Until end of turn"); setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); @@ -146,7 +146,7 @@ public class GideonTest extends CardTestPlayerBase { attack(2, playerB, "Silvercoat Lion"); attack(2, playerB, "Pillarfield Ox"); - activateAbility(4, PhaseStep.PRECOMBAT_MAIN, playerB, "+0: Until "); + activateAbility(4, PhaseStep.PRECOMBAT_MAIN, playerB, "0: Until "); activateAbility(4, PhaseStep.PRECOMBAT_MAIN, playerB, "Equip {2}", "Gideon, Battle-Forged"); attack(4, playerB, "Gideon, Battle-Forged"); // 7 damage diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java index f5606cc2ed5..1324fb02c7f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java @@ -58,7 +58,7 @@ public class TamiyoTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Gideon, Ally of Zendikar", 1); // put 2/2 knight ally token on battlefield - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Create a"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "0: Create a"); // next, activate Gideon to make him a 5/5 human soldier ally creature activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Until end of turn"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ChandraPyromasterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ChandraPyromasterTest.java index ee9f0bf6bbc..ad7ed8d9ca8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ChandraPyromasterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ChandraPyromasterTest.java @@ -3,7 +3,6 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ - package org.mage.test.cards.single; import mage.constants.PhaseStep; @@ -15,30 +14,29 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author LevelX2 */ - public class ChandraPyromasterTest extends CardTestPlayerBase { @Test public void testAbility2CastCardFromExile() { addCard(Zone.BATTLEFIELD, playerA, "Chandra, Pyromaster"); addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); - + skipInitShuffling(); addCard(Zone.LIBRARY, playerA, "Mizzium Mortars"); - + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); - - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Exile the top card of your library. You may play it this turn."); + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "0: Exile the top card of your library. You may play it this turn."); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mizzium Mortars", "Silvercoat Lion"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); assertLife(playerB, 20); - + assertPermanentCount(playerA, "Chandra, Pyromaster", 1); assertGraveyardCount(playerA, "Mizzium Mortars", 1); - + assertPermanentCount(playerB, "Silvercoat Lion", 0); assertGraveyardCount(playerB, "Silvercoat Lion", 1); @@ -54,7 +52,7 @@ public class ChandraPyromasterTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Exile the top card of your library. You may play it this turn."); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "0: Exile the top card of your library. You may play it this turn."); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -66,29 +64,29 @@ public class ChandraPyromasterTest extends CardTestPlayerBase { assertExileCount(playerA, "Ancestral Vision", 1); } - + @Test public void testAbility2CastCardFromExileWithOverlaod() { - + addCard(Zone.BATTLEFIELD, playerA, "Chandra, Pyromaster"); addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6); - + skipInitShuffling(); addCard(Zone.LIBRARY, playerA, "Mizzium Mortars"); - + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 2); - - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Exile the top card of your library. You may play it this turn."); + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "0: Exile the top card of your library. You may play it this turn."); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mizzium Mortars with overload"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); assertLife(playerB, 20); - + assertPermanentCount(playerA, "Chandra, Pyromaster", 1); assertGraveyardCount(playerA, "Mizzium Mortars", 1); - + assertPermanentCount(playerB, "Silvercoat Lion", 0); assertGraveyardCount(playerB, "Silvercoat Lion", 2);