From 397c393f1d1f9c6d37ec5959afa4990d3f5a939b Mon Sep 17 00:00:00 2001 From: magenoxx Date: Sat, 16 Jun 2012 10:41:23 +0400 Subject: [PATCH] Tests refactoring --- .../oneshot}/damage/LightningBoltTest.java | 162 +++++++++--------- .../oneshot}/damage/PsionicBlastTest.java | 52 +++--- .../oneshot/damage/SpitefulShadowsTest.java} | 5 +- .../oneshot}/destroy/HideousEndTest.java | 128 +++++++------- .../oneshot}/destroy/LeaveNoTraceTest.java | 62 +++---- .../events/SearchShuffleTest.java} | 4 +- 6 files changed, 206 insertions(+), 207 deletions(-) rename Mage.Tests/src/test/java/org/mage/test/cards/{ => abilities/oneshot}/damage/LightningBoltTest.java (95%) rename Mage.Tests/src/test/java/org/mage/test/cards/{ => abilities/oneshot}/damage/PsionicBlastTest.java (91%) rename Mage.Tests/src/test/java/org/mage/test/cards/{damage/TestSpitefulShadows.java => abilities/oneshot/damage/SpitefulShadowsTest.java} (93%) rename Mage.Tests/src/test/java/org/mage/test/cards/{ => abilities/oneshot}/destroy/HideousEndTest.java (95%) rename Mage.Tests/src/test/java/org/mage/test/cards/{ => abilities/oneshot}/destroy/LeaveNoTraceTest.java (93%) rename Mage.Tests/src/test/java/org/mage/test/cards/{events/TestSearchShuffle.java => triggers/events/SearchShuffleTest.java} (91%) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/damage/LightningBoltTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java similarity index 95% rename from Mage.Tests/src/test/java/org/mage/test/cards/damage/LightningBoltTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java index c3a430990a8..aaaefe64cc0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/damage/LightningBoltTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/LightningBoltTest.java @@ -1,81 +1,81 @@ -package org.mage.test.cards.damage; - -import mage.Constants; -import mage.Constants.PhaseStep; -import org.junit.Test; -import org.mage.test.serverside.base.CardTestPlayerBase; - -/** - * @author ayrat - */ -public class LightningBoltTest extends CardTestPlayerBase { - - @Test - public void testDamageOpponent() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertLife(playerA, 20); - assertLife(playerB, 17); - } - - @Test - public void testDamageSelf() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerA); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertLife(playerA, 17); - assertLife(playerB, 20); - } - - @Test - public void testDamageSmallCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); - - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Sejiri Merfolk"); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertPermanentCount(playerB, "Sejiri Merfolk", 0); - } - - @Test - public void testDamageBigCreature() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); - - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertPermanentCount(playerB, "Craw Wurm", 1); - } - - @Test - public void testDamageBigCreatureTwice() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); - - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertPermanentCount(playerB, "Craw Wurm", 0); - } - -} +package org.mage.test.cards.abilities.oneshot.damage; + +import mage.Constants; +import mage.Constants.PhaseStep; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * @author ayrat + */ +public class LightningBoltTest extends CardTestPlayerBase { + + @Test + public void testDamageOpponent() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertLife(playerA, 20); + assertLife(playerB, 17); + } + + @Test + public void testDamageSelf() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerA); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertLife(playerA, 17); + assertLife(playerB, 20); + } + + @Test + public void testDamageSmallCreature() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Constants.Zone.BATTLEFIELD, playerB, "Sejiri Merfolk"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Sejiri Merfolk"); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertPermanentCount(playerB, "Sejiri Merfolk", 0); + } + + @Test + public void testDamageBigCreature() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertPermanentCount(playerB, "Craw Wurm", 1); + } + + @Test + public void testDamageBigCreatureTwice() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + addCard(Constants.Zone.BATTLEFIELD, playerB, "Craw Wurm"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Craw Wurm"); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertPermanentCount(playerB, "Craw Wurm", 0); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/damage/PsionicBlastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/PsionicBlastTest.java similarity index 91% rename from Mage.Tests/src/test/java/org/mage/test/cards/damage/PsionicBlastTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/PsionicBlastTest.java index 64c40c714ad..bc7341def54 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/damage/PsionicBlastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/PsionicBlastTest.java @@ -1,26 +1,26 @@ -package org.mage.test.cards.damage; - -import mage.Constants; -import org.junit.Test; -import org.mage.test.serverside.base.CardTestBase; - -/** - * @author Loki - */ -public class PsionicBlastTest extends CardTestBase { - - @Test - public void testDamageInPlayer() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); - addCard(Constants.Zone.HAND, playerA, "Psionic Blast"); - - castSpell(playerA, "Psionic Blast"); - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - - assertLife(playerA, 18); - assertLife(playerB, 16); - } -} +package org.mage.test.cards.abilities.oneshot.damage; + +import mage.Constants; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestBase; + +/** + * @author Loki + */ +public class PsionicBlastTest extends CardTestBase { + + @Test + public void testDamageInPlayer() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Island"); + addCard(Constants.Zone.HAND, playerA, "Psionic Blast"); + + castSpell(playerA, "Psionic Blast"); + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 18); + assertLife(playerB, 16); + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/damage/TestSpitefulShadows.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SpitefulShadowsTest.java similarity index 93% rename from Mage.Tests/src/test/java/org/mage/test/cards/damage/TestSpitefulShadows.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SpitefulShadowsTest.java index 852578bc434..5b8110931d3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/damage/TestSpitefulShadows.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SpitefulShadowsTest.java @@ -1,8 +1,7 @@ -package org.mage.test.cards.damage; +package org.mage.test.cards.abilities.oneshot.damage; import mage.Constants; import mage.counters.CounterType; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -13,7 +12,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author BetaSteward */ -public class TestSpitefulShadows extends CardTestPlayerBase { +public class SpitefulShadowsTest extends CardTestPlayerBase { @Test public void testCard() { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/destroy/HideousEndTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/HideousEndTest.java similarity index 95% rename from Mage.Tests/src/test/java/org/mage/test/cards/destroy/HideousEndTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/HideousEndTest.java index 121e6209a8c..5d5a99dac4b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/destroy/HideousEndTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/HideousEndTest.java @@ -1,64 +1,64 @@ -package org.mage.test.cards.destroy; - -import mage.Constants; -import org.junit.Ignore; -import org.junit.Test; -import org.mage.test.serverside.base.CardTestBase; - -public class HideousEndTest extends CardTestBase { - - @Test - public void testWithValidTarget() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.HAND, playerA, "Hideous End"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Copper Myr"); - - castSpell(playerA, "Hideous End"); - addFixedTarget(playerA, "Hideous End", "Copper Myr"); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertPermanentCount(playerB, "Copper Myr", 0); - assertLife(playerB, 18); - } - - @Test - public void testWithInvalidTarget() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.HAND, playerA, "Hideous End"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Zombie Goliath"); - - castSpell(playerA, "Hideous End"); - addFixedTarget(playerA, "Hideous End", "Zombie Goliath"); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertPermanentCount(playerB, "Zombie Goliath", 1); - assertLife(playerB, 20); - } - - @Test - @Ignore - public void testWithPossibleProtection() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); - addCard(Constants.Zone.HAND, playerA, "Hideous End"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerB, "Copper Myr"); - addCard(Constants.Zone.HAND, playerB, "Apostle's Blessing"); - - castSpell(playerA, "Hideous End"); - addFixedTarget(playerA, "Hideous End", "Copper Myr"); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertPermanentCount(playerB, "Copper Myr", 1); - assertLife(playerB, 20); - } -} +package org.mage.test.cards.abilities.oneshot.destroy; + +import mage.Constants; +import org.junit.Ignore; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestBase; + +public class HideousEndTest extends CardTestBase { + + @Test + public void testWithValidTarget() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.HAND, playerA, "Hideous End"); + addCard(Constants.Zone.BATTLEFIELD, playerB, "Copper Myr"); + + castSpell(playerA, "Hideous End"); + addFixedTarget(playerA, "Hideous End", "Copper Myr"); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertPermanentCount(playerB, "Copper Myr", 0); + assertLife(playerB, 18); + } + + @Test + public void testWithInvalidTarget() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.HAND, playerA, "Hideous End"); + addCard(Constants.Zone.BATTLEFIELD, playerB, "Zombie Goliath"); + + castSpell(playerA, "Hideous End"); + addFixedTarget(playerA, "Hideous End", "Zombie Goliath"); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertPermanentCount(playerB, "Zombie Goliath", 1); + assertLife(playerB, 20); + } + + @Test + @Ignore + public void testWithPossibleProtection() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Swamp"); + addCard(Constants.Zone.HAND, playerA, "Hideous End"); + addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); + addCard(Constants.Zone.BATTLEFIELD, playerB, "Plains"); + addCard(Constants.Zone.BATTLEFIELD, playerB, "Copper Myr"); + addCard(Constants.Zone.HAND, playerB, "Apostle's Blessing"); + + castSpell(playerA, "Hideous End"); + addFixedTarget(playerA, "Hideous End", "Copper Myr"); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertPermanentCount(playerB, "Copper Myr", 1); + assertLife(playerB, 20); + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/destroy/LeaveNoTraceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/LeaveNoTraceTest.java similarity index 93% rename from Mage.Tests/src/test/java/org/mage/test/cards/destroy/LeaveNoTraceTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/LeaveNoTraceTest.java index c790d12d03a..a0516e31946 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/destroy/LeaveNoTraceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/LeaveNoTraceTest.java @@ -1,31 +1,31 @@ -package org.mage.test.cards.destroy; - -import mage.Constants; -import org.junit.Test; -import org.mage.test.serverside.base.CardTestBase; - -/** - * @author Loki - */ -public class LeaveNoTraceTest extends CardTestBase { - - @Test - public void testDestroy() { - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); - addCard(Constants.Zone.HAND, playerA, "Leave No Trace"); - - addCard(Constants.Zone.BATTLEFIELD, playerB, "Asceticism"); // Green - addCard(Constants.Zone.BATTLEFIELD, playerB, "Awakening Zone"); // Green - addCard(Constants.Zone.BATTLEFIELD, playerB, "Back from the Brink"); // Blue - - castSpell(playerA, "Leave No Trace"); - addFixedTarget(playerA, "Leave No Trace", "Asceticism"); - - setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); - execute(); - assertPermanentCount(playerB, "Asceticism", 0); - assertPermanentCount(playerB, "Awakening Zone", 0); - assertPermanentCount(playerB, "Back from the Brink", 1); - } -} +package org.mage.test.cards.abilities.oneshot.destroy; + +import mage.Constants; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestBase; + +/** + * @author Loki + */ +public class LeaveNoTraceTest extends CardTestBase { + + @Test + public void testDestroy() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Constants.Zone.HAND, playerA, "Leave No Trace"); + + addCard(Constants.Zone.BATTLEFIELD, playerB, "Asceticism"); // Green + addCard(Constants.Zone.BATTLEFIELD, playerB, "Awakening Zone"); // Green + addCard(Constants.Zone.BATTLEFIELD, playerB, "Back from the Brink"); // Blue + + castSpell(playerA, "Leave No Trace"); + addFixedTarget(playerA, "Leave No Trace", "Asceticism"); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + assertPermanentCount(playerB, "Asceticism", 0); + assertPermanentCount(playerB, "Awakening Zone", 0); + assertPermanentCount(playerB, "Back from the Brink", 1); + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/events/TestSearchShuffle.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/SearchShuffleTest.java similarity index 91% rename from Mage.Tests/src/test/java/org/mage/test/cards/events/TestSearchShuffle.java rename to Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/SearchShuffleTest.java index 8debaa7f4c4..a87516b390f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/events/TestSearchShuffle.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/SearchShuffleTest.java @@ -1,4 +1,4 @@ -package org.mage.test.cards.events; +package org.mage.test.cards.triggers.events; import mage.Constants; import mage.counters.CounterType; @@ -9,7 +9,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author BetaSteward_at_googlemail.com */ -public class TestSearchShuffle extends CardTestPlayerBase { +public class SearchShuffleTest extends CardTestPlayerBase { /**