From f623e45d4bc9809b3962c7bf490a5a72be2640d3 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 24 Jun 2023 01:36:56 -0400 Subject: [PATCH] add strict choose mode to other recent tests --- .../single/chk/OathkeeperTakenosDaishoTest.java | 15 +++++++++------ .../cards/triggers/ReturnToHandEffectsTest.java | 9 +++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/OathkeeperTakenosDaishoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/OathkeeperTakenosDaishoTest.java index 79742e688d6..2ea6c4c607f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/OathkeeperTakenosDaishoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/OathkeeperTakenosDaishoTest.java @@ -23,10 +23,11 @@ public class OathkeeperTakenosDaishoTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, samurai, 1); addCard(Zone.HAND, playerA, removeEquipped, 1); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", samurai); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, removeEquipped); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, removeEquipped, samurai); + setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -43,10 +44,11 @@ public class OathkeeperTakenosDaishoTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Elite Vanguard", 1); addCard(Zone.HAND, playerA, removeEquipped, 1); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Elite Vanguard"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, removeEquipped); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, removeEquipped, "Elite Vanguard"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -63,10 +65,11 @@ public class OathkeeperTakenosDaishoTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, samurai, 1); addCard(Zone.HAND, playerA, removeEquipment, 1); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", samurai); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, removeEquipment); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, removeEquipment, equipment); + setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java index c08a7f85ea4..52e4d237895 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java @@ -92,6 +92,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wind Zendikon", "Mountain"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Disfigure", "Mountain"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 2 for perm, 3 for card @@ -115,6 +116,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wind Zendikon", "Tangled Vale"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Disfigure", "Tangled Vale"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 2 for perm, 1 for card (?!) @@ -138,6 +140,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wind Zendikon", "Riverglide Pathway"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Disfigure", "Riverglide Pathway"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 2 for perm, 1 for card (?!) @@ -161,6 +164,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wind Zendikon", "Lavaglide Pathway"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Disfigure", "Lavaglide Pathway"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 2 for perm, 1 for card (?!) @@ -184,6 +188,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Demonic Vigor", "Dryad Sophisticate"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Disfigure", "Dryad Sophisticate"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 3 for perm, 4 for card @@ -207,6 +212,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Demonic Vigor", "Tangled Florahedron"); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Disfigure", "Tangled Florahedron"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 3 for perm, 2 for card (?!) @@ -236,6 +242,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { waitStackResolved(1, PhaseStep.POSTCOMBAT_MAIN); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Disfigure", "Dryad Sophisticate"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 7 for perm, 8 for card @@ -265,6 +272,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { waitStackResolved(1, PhaseStep.POSTCOMBAT_MAIN); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Disfigure", "Tangled Florahedron"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 7 for perm, 4 for card (?!) @@ -295,6 +303,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { waitStackResolved(1, PhaseStep.BEGIN_COMBAT, 1); castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Coat with Venom", "Carrion Feeder"); + setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); // ZCC is 3 for perm, 6 for card, so should not return