From 263b51521615e6157a3a9a63b08ca7638a861858 Mon Sep 17 00:00:00 2001 From: Loki Date: Mon, 28 May 2012 21:12:48 +0300 Subject: [PATCH] fix Cascade, add test for it (test currently broken) --- Mage.Tests/src/test/java/org/Test.java | 23 ---------------- .../cards/triggers/BloodbraidElfTest.java | 27 +++++++++++++++++++ .../abilities/keyword/CascadeAbility.java | 2 +- 3 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 Mage.Tests/src/test/java/org/Test.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java diff --git a/Mage.Tests/src/test/java/org/Test.java b/Mage.Tests/src/test/java/org/Test.java deleted file mode 100644 index d695cff9a41..00000000000 --- a/Mage.Tests/src/test/java/org/Test.java +++ /dev/null @@ -1,23 +0,0 @@ -package org - -import mage.Constants -import mage.game.match.MatchOptions -import mage.game.tournament.LimitedOptions -import mage.view.SeatView - -import java.util.ArrayList -import java.util.Date -import java.util.List -import java.util.UUID - -/** - * Created by IntelliJ IDEA. - * User: ayratn - * Date: 5/27/12 - * Time: 8:44 AM - * To change this template use File | Settings | File Templates. - */ -public interface Test { - - -} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java new file mode 100644 index 00000000000..28316e17e49 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BloodbraidElfTest.java @@ -0,0 +1,27 @@ +package org.mage.test.cards.triggers; + +import mage.Constants; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +public class BloodbraidElfTest extends CardTestPlayerBase { + @Test + public void testCascade() { + addCard(Constants.Zone.HAND, playerA, "Bloodbraid Elf"); + addCard(Constants.Zone.HAND, playerA, "Unsummon"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Goblin Wardriver", 1); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Island", 1); + + castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Unsummon", "Goblin Wardriver"); + + castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Bloodbraid Elf"); + + setStopAt(1, Constants.PhaseStep.END_TURN); + execute(); + + assertPermanentCount(playerA, "Bloodbraid Elf", 1); + assertPermanentCount(playerA, "Goblin Wardriver", 1); + } +} diff --git a/Mage/src/mage/abilities/keyword/CascadeAbility.java b/Mage/src/mage/abilities/keyword/CascadeAbility.java index 6d1aaf66027..153a0c69b26 100644 --- a/Mage/src/mage/abilities/keyword/CascadeAbility.java +++ b/Mage/src/mage/abilities/keyword/CascadeAbility.java @@ -94,7 +94,7 @@ class CascadeEffect extends OneShotEffect { Card card; Player player = game.getPlayer(source.getControllerId()); ExileZone exile = game.getExile().createZone(source.getSourceId(), player.getName() + " Cascade"); - int sourceCost = game.getObject(source.getSourceId()).getManaCost().convertedManaCost(); + int sourceCost = game.getCard(source.getSourceId()).getManaCost().convertedManaCost(); do { card = player.getLibrary().removeFromTop(game); if (card == null)