diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java index e3e4b19262d..ae10772bf97 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java @@ -513,7 +513,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { } @Test - //@Ignore("Not yet working correctly.") public void testCastTreatsToShareWithWrennAndSixEmblem() { /* * Wrenn and Six {R}{G} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SkullclampTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SkullclampTest.java index fd1457ef6c6..9ddf366fe34 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SkullclampTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SkullclampTest.java @@ -3,6 +3,7 @@ package org.mage.test.cards.enchantments; import mage.constants.PhaseStep; import mage.constants.Zone; import org.junit.Ignore; +import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** @@ -25,8 +26,7 @@ public class SkullclampTest extends CardTestPlayerBase { * 704.5n.) * */ - - // This test does not work, but the example works in the game fine. + @Test @Ignore public void testPerniciousDeed() { // Equipped creature gets +1/-1. diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/HorobiDeathsWailTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/HorobiDeathsWailTest.java index d85f937380e..6fa38d5618e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/HorobiDeathsWailTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/HorobiDeathsWailTest.java @@ -2,7 +2,6 @@ package org.mage.test.cards.single.chk; import mage.constants.PhaseStep; import mage.constants.Zone; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -10,7 +9,6 @@ public class HorobiDeathsWailTest extends CardTestPlayerBase { // issue 7772 @Test - @Ignore public void animateDeadOnHorobi(){ // Animate Dead addCard(Zone.HAND, playerA, "Animate Dead"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/RealitySmasherTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/RealitySmasherTest.java index 45f6d740bb1..826af8c88e3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/RealitySmasherTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/RealitySmasherTest.java @@ -2,7 +2,6 @@ package org.mage.test.cards.single.ogw; import mage.constants.PhaseStep; import mage.constants.Zone; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -12,9 +11,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ public class RealitySmasherTest extends CardTestPlayerBase { - - // Cannot figure out how to setup any of these tests to work with Reality Smashers triggered ability - @Ignore + @Test public void testSimpleKillSpellChooseToDiscard() { @@ -30,6 +27,7 @@ public class RealitySmasherTest extends CardTestPlayerBase { setChoice(playerB, true); // discard to prevent counter setChoice(playerB, "Sigiled Starfish"); setStopAt(1, PhaseStep.BEGIN_COMBAT); + setStrictChooseMode(true); execute(); assertGraveyardCount(playerB, "Doom Blade", 1); @@ -37,9 +35,7 @@ public class RealitySmasherTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Sigiled Starfish", 1); assertGraveyardCount(playerA, "Reality Smasher", 1); } - - // Cannot figure out how to setup any of these tests to work with Reality Smashers triggered ability - @Ignore + @Test public void testSimpleKillSpellChooseNotToDiscard() { @@ -53,14 +49,13 @@ public class RealitySmasherTest extends CardTestPlayerBase { addTarget(playerB, "Reality Smasher"); setChoice(playerB, false); // no discard setStopAt(1, PhaseStep.BEGIN_COMBAT); + setStrictChooseMode(true); execute(); assertGraveyardCount(playerB, "Doom Blade", 1); assertPermanentCount(playerA, "Reality Smasher", 1); } - - // Cannot figure out how to setup any of these tests to work with Reality Smashers triggered ability - @Ignore + @Test public void testTargettedByPyromancerGoggleCopy() { @@ -83,6 +78,7 @@ public class RealitySmasherTest extends CardTestPlayerBase { setChoice(playerA, "Swamp"); setStopAt(1, PhaseStep.BEGIN_COMBAT); + setStrictChooseMode(true); execute(); assertGraveyardCount(playerA, "Lightning Bolt", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/TargetedTriggeredTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/TargetedTriggeredTest.java index 439a144e5b6..a58df8f083f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/TargetedTriggeredTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/TargetedTriggeredTest.java @@ -21,7 +21,6 @@ public class TargetedTriggeredTest extends CardTestPlayerBase { * */ @Test - //@Ignore // this does not currently work in test (????), because the target event will be fired earlier during tests, // so the zone change counter for the fixed target of the counterspell will not work // UPDATE: seems to work fine now? 04/19/2017 escplan9 @@ -120,12 +119,12 @@ public class TargetedTriggeredTest extends CardTestPlayerBase { } /* - NOTE: test is failing due to card bug as of 04/20/2017. See issue #3180 + NOTE: test was failing due to card bug, resolved as of 04/20/2017. See issue #3180 I had a Glyph Keeper on board (cloned with Vizier of many faces). -- note this test is a simplified version, next test will test on the Clone if needed First I played a Soulstinger and targeted the Glyph Keeper, the ability was countered. Then on the same main phase I played a Cartouche of Strength targeting the Glyph Keeper, that was also countered. Only the first should have been countered. */ - @Ignore // This scenario works fine in the game. + @Test public void testGlyphKeeperCountersFirstAbilityButNotSecondOne() { /* @@ -163,10 +162,13 @@ public class TargetedTriggeredTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, sStinger); addTarget(playerA, gKeeper); // should be countered by Glyph Keeper clause as first ability targetting it + waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, cStrength, gKeeper); // should not be countered anymore + setChoice(playerA, true); addTarget(playerA, memnite); // Cartouche of Strength fight setStopAt(1, PhaseStep.BEGIN_COMBAT); + setStrictChooseMode(true); execute(); assertPermanentCount(playerA, gKeeper, 1); @@ -174,7 +176,8 @@ public class TargetedTriggeredTest extends CardTestPlayerBase { assertGraveyardCount(playerA, cStrength, 0); // should not be countered assertPermanentCount(playerA, cStrength, 1); assertGraveyardCount(playerB, memnite, 1); // dies from fight - assertPowerToughness(playerA, gKeeper, 5, 3, Filter.ComparisonScope.All); // Soul Stinger should never have given it two -1/-1 counters + assertPowerToughness(playerA, gKeeper, 6, 4, Filter.ComparisonScope.All); // Soul Stinger should never have given it two -1/-1 counters + //And Cartouche of Strength gives +1/+1 assertCounterCount(playerA, gKeeper, CounterType.M1M1, 0); } }