* Discard - Fixed that discard cost are valid if Rest in Peace is in play.

Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DiscardTest.java

@@ -0,0 +1,72 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package org.mage.test.cards.abilities.keywords;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class DiscardTest extends CardTestPlayerBase {
+
+   /*
+    * If Rest in Peace is in play, every card going to the graveyard goes to exile intead.
+    * If a card is discarded while Rest in Peace is on the battlefield, abilities that function
+    * when a card is discarded (such as madness) still work, even though that card never reaches
+    * a graveyard.
+    */
+
+    @Test
+    public void testRestInPeaceAndCycle() {
+        // Check that Lion goes to graveyard from evoke ability
+        // Check that evoke does not trigger again to sacrifice Shriekmaw if it's exhumed
+
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 1);
+        addCard(Zone.HAND, playerA, "Tranquil Thicket");
+
+        addCard(Zone.BATTLEFIELD, playerB, "Rest in Peace", 1);
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cycling {G} <i>({G},Discard {this}: Draw a card.)</i>");
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+
+        assertHandCount(playerA, "Tranquil Thicket", 0);
+        assertExileCount("Tranquil Thicket", 1);
+        assertHandCount(playerA, 1); // the card drawn by Cycling
+    }
+
+}

Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java

@@ -26,6 +26,8 @@ import org.mage.test.serverside.base.MageTestPlayerBase;
 
 import java.util.List;
 import java.util.UUID;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.NamePredicate;
 
 /**
  * API for test initialization and asserting the test results.
@@ -557,6 +559,20 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
         Assert.assertEquals("(Hand) Card counts are not equal ", count, actual);
     }
 
+    /**
+     * Assert card count in player's hand.
+     *
+     * @param player   {@link Player} who's hand should be counted.
+     * @param cardName  Name of the cards that should be counted.
+     * @param count    Expected count.
+     */
+    public void assertHandCount(Player player, String cardName, int count) throws AssertionError {
+        FilterCard filter = new FilterCard();
+        filter.add(new NamePredicate(cardName));
+        int actual = currentGame.getPlayer(player.getId()).getHand().count(filter, player.getId(), currentGame);
+        Assert.assertEquals("(Hand) Card counts for card " + cardName + " are not equal ", count, actual);
+    }
+
     /**
      * Assert card count in player's graveyard.
      *