From ef33472ee5aff6b9dcf5698d00a402c291e62e2f Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sun, 15 Apr 2018 13:50:48 -0400 Subject: [PATCH] fixed some tests and text --- .../TokenImplActivatedAbilityTest.java | 6 ++--- .../mage/test/cards/mana/CryptGhastTest.java | 8 +++--- .../mage/test/cards/mana/ManaFlareTest.java | 26 +++++++++---------- .../cards/rules/MeliraSylvokOutcastTest.java | 2 +- .../mage/test/game/ends/GameIsADrawTest.java | 2 +- .../token/FreyaliseLlanowarsFuryToken.java | 4 +-- 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java index af19dd96d97..d8205d63d00 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java @@ -50,9 +50,9 @@ public class TokenImplActivatedAbilityTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Omnath, Locus of Mana", 1); addCard(Zone.BATTLEFIELD, playerA, "Freyalise, Llanowar's Fury"); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); - activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G} to your mana pool."); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G}.\""); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G}.\""); + activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G}."); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java index 54f9684f2e7..9e70bf44f65 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java @@ -49,8 +49,8 @@ public class CryptGhastTest extends CardTestPlayerBase { // Swamp Mountain addCard(Zone.BATTLEFIELD, playerA, "Badlands", 1); - activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R} to your mana pool"); - activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B} to your mana pool"); + activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); + activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Erebos's Titan"); setStopAt(1, PhaseStep.BEGIN_COMBAT); @@ -88,8 +88,8 @@ public class CryptGhastTest extends CardTestPlayerBase { setChoice(playerB, "X=2"); // Crypt Ghast may no longer give additional mana - activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R} to your mana pool"); - activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B} to your mana pool"); + activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); + activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {B}"); castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Erebos's Titan"); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java index 203eda4664d..31660bb3359 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java @@ -36,7 +36,6 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author LevelX2 */ - public class ManaFlareTest extends CardTestPlayerBase { @Test @@ -50,20 +49,20 @@ public class ManaFlareTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Vedalken Mastermind", 1); // because available mana calculation does not work correctly with Mana Flare we have to tap the land manually - activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {U} to your mana pool"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Vedalken Mastermind"); - + activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {U}"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Vedalken Mastermind"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - + assertPermanentCount(playerA, "Vedalken Mastermind", 1); } - - + /** - * Mana Flare is only adding colorless mana, at least off of dual lands (Watery Grave in this instance). - * Island only adds colorless. Plains adds white though. + * Mana Flare is only adding colorless mana, at least off of dual lands + * (Watery Grave in this instance). Island only adds colorless. Plains adds + * white though. */ @Test public void testWateryGrave() { @@ -76,15 +75,14 @@ public class ManaFlareTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Nantuko Shade", 1); // because available mana calculation does not work correctly with Mana Flare we have to tap the land manually - activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {B} to your mana pool"); - castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Nantuko Shade"); - + activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {B}"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Nantuko Shade"); + setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - + assertPermanentCount(playerB, "Nantuko Shade", 1); } - } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java index 4dcc4178116..a28f00647a6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java @@ -59,7 +59,7 @@ public class MeliraSylvokOutcastTest extends CardTestPlayerBase { // Put a -1/-1 counter on Devoted Druid: Untap Devoted Druid. addCard(Zone.BATTLEFIELD, playerA, "Devoted Druid", 1); // 0/2 - activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G} to your mana pool"); + activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G}"); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Put a -1/-1 counter on "); setStopAt(1, PhaseStep.BEGIN_COMBAT); 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 824d247ebaf..8c0674a3b40 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 @@ -167,7 +167,7 @@ public class GameIsADrawTest extends CardTestPlayerBase { Assert.assertFalse("Game should not have ended.", currentGame.hasEnded()); assertLife(playerA, 100); - Assert.assertFalse("No inifinite loop detected, game has be no draw.", currentGame.isADraw()); + Assert.assertFalse("No infinite loop detected, game has be no draw.", currentGame.isADraw()); } diff --git a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java index 429a5d4376d..90effac277a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java @@ -25,8 +25,8 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.game.permanent.token; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -57,7 +57,7 @@ public class FreyaliseLlanowarsFuryToken extends TokenImpl { } public FreyaliseLlanowarsFuryToken(String setCode, int tokenType) { - super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); + super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G}.\""); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode(setCode); this.cardType.add(CardType.CREATURE);