reenabled/removed/fixed some ignored tests

Mage.Tests/src/test/java/org/mage/test/AI/basic/CostModificationTest.java

@@ -3,12 +3,10 @@ package org.mage.test.AI.basic;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBaseAI;
 
 /**
- *
  * @author LevelX2
  */
 public class CostModificationTest extends CardTestPlayerBaseAI {
@@ -18,8 +16,6 @@ public class CostModificationTest extends CardTestPlayerBaseAI {
      * Once played, I am stuck at "Waiting for Computer" forever...
      */
     @Test
-    @Ignore
-    // TODO: Check why sometimes Silvercoat Lion is not cast from AI
     public void testFluctuator() {
         addCard(Zone.HAND, playerA, "Silvercoat Lion");
         // Destroy all artifacts, creatures, and enchantments.

Mage.Tests/src/test/java/org/mage/test/cards/mana/HarvesterDruidTest.java

@@ -4,19 +4,18 @@ import mage.abilities.mana.ManaOptions;
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
-import static org.mage.test.utils.ManaOptionsTestUtils.*;
+
+import static org.mage.test.utils.ManaOptionsTestUtils.assertDuplicatedManaOptions;
+import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions;
 
 /**
- *
  * @author LevelX2, JayDi85
  */
 public class HarvesterDruidTest extends CardTestPlayerBase {
 
     @Test
-    @Ignore
     public void testOneInstance() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
@@ -35,7 +34,6 @@ public class HarvesterDruidTest extends CardTestPlayerBase {
     }
 
     @Test
-    @Ignore
     public void testTwoInstances() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);

Mage.Tests/src/test/java/org/mage/test/cards/mana/SylvokExplorerTest.java

@@ -4,18 +4,15 @@ import mage.abilities.mana.ManaOptions;
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
 /**
- *
  * @author LevelX2
  */
 public class SylvokExplorerTest extends CardTestPlayerBase {
 
     @Test
-    @Ignore
     public void testOneInstance() {
         addCard(Zone.BATTLEFIELD, playerB, "Island", 1);
         addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
@@ -44,11 +41,11 @@ public class SylvokExplorerTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
 
         setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
-        
+
         setStrictChooseMode(true);
         execute();
         assertAllCommandsUsed();
-        
+
         ManaOptions options = playerA.getAvailableManaTest(currentGame);
         Assert.assertEquals("Player should be able to create 3 white mana", "{W}{W}{W}", options.get(0).toString());
     }

Mage.Tests/src/test/java/org/mage/test/cards/mana/VorinclexVoiceOfHungerTest.java

@@ -4,12 +4,10 @@ import mage.constants.ManaType;
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
 /**
- *
  * @author LevelX2
  */
 public class VorinclexVoiceOfHungerTest extends CardTestPlayerBase {
@@ -91,7 +89,6 @@ public class VorinclexVoiceOfHungerTest extends CardTestPlayerBase {
     }
 
     @Test
-    @Ignore
     public void testCastWithGemstoneCavern() {
         // Trample
         // Whenever you tap a land for mana, add one mana of any type that land produced.

Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/RedirectDamageToPlaneswalkerTest.java

@@ -1,46 +0,0 @@
-
-package org.mage.test.cards.planeswalker;
-
-import mage.constants.PhaseStep;
-import mage.constants.Zone;
-import mage.counters.CounterType;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mage.test.serverside.base.CardTestPlayerBase;
-
-/**
- *
- * @author LevelX2
- */
-public class RedirectDamageToPlaneswalkerTest extends CardTestPlayerBase {
-
-    @Ignore
-    @Test
-    public void testDirectDamage() {
-        // +2: Look at the top card of target player's library. You may put that card on the bottom of that player's library.
-        // 0: Draw three cards, then put two cards from your hand on top of your library in any order.
-        // −1: Return target creature to its owner's hand.
-        addCard(Zone.BATTLEFIELD, playerA, "Jace, the Mind Sculptor"); // starts with 3 Loyality counters
-
-        addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
-        addCard(Zone.HAND, playerB, "Lightning Bolt");
-
-        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2:", playerB);
-
-        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA);
-        setChoice(playerB, "Yes");
-
-        setStopAt(1, PhaseStep.END_TURN);
-        execute();
-
-        assertPermanentCount(playerA, "Jace, the Mind Sculptor", 1);
-        assertCounterCount("Jace, the Mind Sculptor", CounterType.LOYALTY, 2);  // 3 + 2 - 3 = 2
-
-        assertGraveyardCount(playerB, "Lightning Bolt", 1);
-
-        assertLife(playerA, 20);
-        assertLife(playerB, 20);
-
-    }
-
-}

Mage.Tests/src/test/java/org/mage/test/cards/replacement/ClergyOfTheHolyNimbusTest.java

@@ -2,12 +2,10 @@ package org.mage.test.cards.replacement;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
 /**
- *
  * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
  */
 public class ClergyOfTheHolyNimbusTest extends CardTestPlayerBase {
@@ -20,15 +18,15 @@ public class ClergyOfTheHolyNimbusTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerB, "Clergy of the Holy Nimbus"); // {W} 1/1
         addCard(Zone.HAND, playerA, "Doom Blade"); // {1}{B} destroy target non-black creature
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
-        
+
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Doom Blade", "Clergy of the Holy Nimbus");
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        
+
         assertGraveyardCount(playerA, "Doom Blade", 1);
         assertPermanentCount(playerB, "Clergy of the Holy Nimbus", 1);
     }
-    
+
     @Test
     public void testCannotBeRegeneratedSpell() {
 
@@ -37,31 +35,30 @@ public class ClergyOfTheHolyNimbusTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerB, "Clergy of the Holy Nimbus"); // {W} 1/1
         addCard(Zone.HAND, playerA, "Wrath of God"); // {2}{W}{W} destroy all creatures, they cannot be regenerated
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 4);
-        
+
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wrath of God");
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
-        
+
         assertGraveyardCount(playerA, "Wrath of God", 1);
         assertGraveyardCount(playerB, "Clergy of the Holy Nimbus", 1);
     }
-  
+
     // in game testing works correctly - not sure if the ability is being activated or not here.
-    @Ignore
     @Test
     public void testOpponentPaysOneToNotAllowRegeneration() {
-        
+
         // If Clergy of the Holy Nimbus would be destroyed, regenerate it.
         // {1}: Clergy of the Holy Nimbus can't be regenerated this turn. Only any opponent may activate this ability.
         addCard(Zone.BATTLEFIELD, playerB, "Clergy of the Holy Nimbus"); // {W} 1/1
         addCard(Zone.HAND, playerA, "Doom Blade"); // {1}{B} destroy target non-black creature
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3);
-        
+
         activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}:");
         castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Doom Blade", "Clergy of the Holy Nimbus");
         setStopAt(1, PhaseStep.END_TURN);
         execute();
-        
+
         assertGraveyardCount(playerA, "Doom Blade", 1);
         assertGraveyardCount(playerB, "Clergy of the Holy Nimbus", 1);
     }

Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java

@@ -3,12 +3,10 @@ package org.mage.test.cards.replacement;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
 /**
- *
  * @author LevelX2
  */
 public class DamageEffectsTest extends CardTestPlayerBase {
@@ -70,49 +68,4 @@ public class DamageEffectsTest extends CardTestPlayerBase {
         assertLife(playerA, 32);
 
     }
-
-    @Ignore
-    @Test
-    public void vexingDevilFurnaceRathRedirectToPlaneswalker() {
-
-        /*
-    Vexing Devil {R}
-    Creature — Devil
-    When Vexing Devil enters the battlefield, any opponent may have it deal 4 damage to them. If a player does, sacrifice Vexing Devil.
-         */
-        String vDevil = "Vexing Devil";
-
-        /*
-    Nissa, Worldwaker {3}{G}{G}
-    Planeswalker — Nissa
-    +1: Target land you control becomes a 4/4 Elemental creature with trample. It's still a land.
-    +1: Untap up to four target Forests.
-    −7: Search your library for any number of basic land cards, put them onto the battlefield, then shuffle your library. Those lands become 4/4 Elemental creatures with trample. They're still lands.
-         */
-        String nissa = "Nissa, Worldwaker";
-
-        /*
-    Furnace of Rath {1}{R}{R}{R}
-    Enchantment
-    If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-         */
-        addCard(Zone.BATTLEFIELD, playerB, "Furnace of Rath");
-        addCard(Zone.HAND, playerB, vDevil);
-        addCard(Zone.HAND, playerA, nissa);
-        addCard(Zone.BATTLEFIELD, playerA, "Forest", 5);
-        addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
-
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, nissa);
-        castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, vDevil);
-        setChoice(playerA, "Yes"); // deal 8 damage to playerA and sac vexing devil (8 due to furnace)
-        setChoice(playerB, "Yes"); // redirect to planeswalker
-        addTarget(playerB, nissa);
-
-        setStopAt(2, PhaseStep.BEGIN_COMBAT);
-        execute();
-
-        assertGraveyardCount(playerB, vDevil, 1);
-        assertLife(playerA, 20);
-        assertGraveyardCount(playerA, nissa, 1);
-    }
 }

Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java

@@ -2,12 +2,10 @@ package org.mage.test.cards.single.avr;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
 /**
- *
  * @author noxx
  */
 public class CavernOfSoulsTest extends CardTestPlayerBase {
@@ -195,10 +193,8 @@ public class CavernOfSoulsTest extends CardTestPlayerBase {
      * Return to the Ranks cannot be countered if mana produced by Cavern of
      * Souls was used to pay X. Can be bug also for all other spells with X in
      * their cost, not sure.
-     *
      */
     @Test
-    @Ignore
     public void testCastWithColorlessManaCanBeCountered() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
         addCard(Zone.HAND, playerA, "Cavern of Souls");
@@ -214,8 +210,9 @@ public class CavernOfSoulsTest extends CardTestPlayerBase {
 
         playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cavern of Souls");
         setChoice(playerA, "Drake");
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Return to the Ranks", "Silvercoat Lion");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Return to the Ranks");
         setChoice(playerA, "X=1");
+        addTarget(playerA, "Silvercoat Lion");
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Counterspell", "Return to the Ranks");
 

Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AzusaLostButSeekingTest.java

@@ -2,7 +2,6 @@ package org.mage.test.cards.single.m21;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
@@ -11,8 +10,7 @@ public class AzusaLostButSeekingTest extends CardTestPlayerBase {
     private static final String azusa = "Azusa, Lost but Seeking";
 
     @Test
-    @Ignore
+    public void playAdditionalLands() {
-    public void playAdditionalLands(){
         addCard(Zone.BATTLEFIELD, playerA, azusa);
         addCard(Zone.HAND, playerA, "Forest", 4);
 
@@ -21,10 +19,8 @@ public class AzusaLostButSeekingTest extends CardTestPlayerBase {
         playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest");
         playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest");
 
-        setStrictChooseMode(true);
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
 
         assertPermanentCount(playerA, "Forest", 3);
     }

Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DemonicEmbraceTest.java

@@ -2,14 +2,12 @@ package org.mage.test.cards.single.m21;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
 public class DemonicEmbraceTest extends CardTestPlayerBase {
 
     @Test
-    @Ignore
     public void playFromGraveyard() {
         // Enchanted creature gets +3/+1, has flying, and is a Demon in addition to its other types.
         // You may cast Demonic Embrace from your graveyard by paying 3 life and discarding a card in addition to paying its other costs.
@@ -19,11 +17,14 @@ public class DemonicEmbraceTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Demonic Embrace", "Grizzly Bears");
-        //addTarget(playerA, );
         addTarget(playerA, "Mountain");
-        setStrictChooseMode(true);
+
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
         execute();
-        assertAllCommandsUsed();
+
+        assertPermanentCount(playerA, "Demonic Embrace", 1);
+        assertPowerToughness(playerA, "Grizzly Bears", 5, 3);
+        assertGraveyardCount(playerA, "Mountain", 1);
+        assertLife(playerA, 20 - 3);
     }
 }