External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 20:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix tests after 'enters the battlefield' -> 'enters' change

Browse source
This commit is contained in:
Susucre 2024-07-30 16:21:23 +02:00
parent a76ef60820
commit fa24f8f53b
13 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java
View file

@ -75,7 +75,7 @@ public class EvokeTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mulldrifter");
setChoice(playerA, "Cast with Evoke alternative cost: {2}{U} (source: Mulldrifter");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, 1);
setChoice(playerA, "When {this} enters the battlefield, draw"); //Stack triggers
setChoice(playerA, "When {this} enters, draw"); //Stack triggers
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wrong Turn");
addTarget(playerA, playerB);

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/WardTest.java
View file

@ -20,7 +20,7 @@ public class WardTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Solitude");
setChoice(playerA, "Cast with Evoke alternative cost: Exile a white card from your hand (source: Solitude");
setChoice(playerA, "Healer's Hawk");
setChoice(playerA, "When {this} enters the battlefield, exile up to one other target creature"); // Put exile trigger on the stack first (evoke trigger will resolve first)
setChoice(playerA, "When {this} enters, exile up to one other target creature"); // Put exile trigger on the stack first (evoke trigger will resolve first)
addTarget(playerA, "Waterfall Aerialist");
setChoice(playerA, "No"); // Do not pay Ward cost
setStopAt(1, PhaseStep.END_TURN);

4
Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/AuratouchedMageTest.java
View file

@ -55,11 +55,11 @@ public class AuratouchedMageTest extends CardTestPlayerBase {
// prepare mage's ETB trigger
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Auratouched Mage");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, 1); // Wait for Auratouched Mage to ETB
checkStackObject("prepare etb", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "When {this} enters the battlefield", 1);
checkStackObject("prepare etb", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "When {this} enters", 1);
// make mage as artifact before ETB resolve
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Argent Mutation", "Auratouched Mage");
checkStackObject("prepare artifact", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "When {this} enters the battlefield", 1);
checkStackObject("prepare artifact", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "When {this} enters", 1);
checkStackObject("prepare artifact", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Argent Mutation", 1);
// on etb resolve: search aura and attach it to mage

6
Mage.Tests/src/test/java/org/mage/test/cards/single/clb/LaezelsAcrobaticsTest.java
View file

@ -40,7 +40,7 @@ public class LaezelsAcrobaticsTest extends CardTestPlayerBase {
checkExileCount("Exiled", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, auramancer, 1);
checkExileCount("Exiled", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, dwarf, 1);
setChoice(playerA, "When {this} enters the battlefield, create"); // order triggers
setChoice(playerA, "When {this} enters, create"); // order triggers
setChoice(playerA, true); // Auramancer: yes to return
addTarget(playerA, wings); // enchantment to return
@ -67,7 +67,7 @@ public class LaezelsAcrobaticsTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, knight);
setDieRollResult(playerA, 10);
castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, acrobatics);
setChoice(playerA, "When {this} enters the battlefield, create"); // order triggers
setChoice(playerA, "When {this} enters, create"); // order triggers
setChoice(playerA, true); // Auramancer: yes to return
addTarget(playerA, wings); // enchantment to return
@ -75,7 +75,7 @@ public class LaezelsAcrobaticsTest extends CardTestPlayerBase {
checkExileCount("Exiled", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, auramancer, 1);
checkExileCount("Exiled", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, dwarf, 1);
setChoice(playerA, "When {this} enters the battlefield, create"); // order triggers
setChoice(playerA, "When {this} enters, create"); // order triggers
setChoice(playerA, true); // Auramancer: yes to return
addTarget(playerA, wings); // enchantment to return

13
Mage.Tests/src/test/java/org/mage/test/cards/single/cns/PalaceJailerTest.java
View file

@ -7,7 +7,6 @@ import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class PalaceJailerTest extends CardTestPlayerBase {
@ -25,7 +24,7 @@ public class PalaceJailerTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Palace Jailer");
setChoice(playerA, "When {this} enters the battlefield, you become the monarch.");
setChoice(playerA, "When {this} enters, you become the monarch.");
addTarget(playerA, "Silvercoat Lion");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
@ -39,9 +38,9 @@ public class PalaceJailerTest extends CardTestPlayerBase {
/**
* TheGibber on reddit
*
* <p>
* Palace Jailer
*
* <p>
* When exile effect is on more than one target from the same palace jailer
* card, and you lose monarch, only the most recent card is returned to play
* instead of all of them
@ -63,17 +62,17 @@ public class PalaceJailerTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Palace Jailer");
setChoice(playerA, "When {this} enters the battlefield, you become the monarch.");
setChoice(playerA, "When {this} enters, you become the monarch.");
addTarget(playerA, "Silvercoat Lion");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cloudshift", "Palace Jailer");
setChoice(playerA, "When {this} enters the battlefield, you become the monarch.");
setChoice(playerA, "When {this} enters, you become the monarch.");
addTarget(playerA, "Pillarfield Ox");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Palace Jailer");
setChoice(playerB, "When {this} enters the battlefield, you become the monarch.");
setChoice(playerB, "When {this} enters, you become the monarch.");
addTarget(playerB, "Silvercoat Lion");
setStopAt(2, PhaseStep.BEGIN_COMBAT);

2
Mage.Tests/src/test/java/org/mage/test/cards/single/eve/PyrrhicRevivalTest.java
View file

@ -29,7 +29,7 @@ public class PyrrhicRevivalTest extends CardTestPlayerBase {
addCard(Zone.HAND, playerA, revival);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, revival);
setChoice(playerA, "When {this} enters the battlefield, you gain 3 life.");
setChoice(playerA, "When {this} enters, you gain 3 life.");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);

2
Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java
View file

@ -33,7 +33,7 @@ public class SpreadingPlagueTest extends CardTestPlayerBase {
// play colorless creature and do not destroy anything
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Golos, Tireless Pilgrim");
setChoice(playerA, "When {this} enters the battlefield"); // two replacement effects
setChoice(playerA, "When {this} enters"); // two replacement effects
setChoice(playerA, false); // no search
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCount("after colorless play", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Golos, Tireless Pilgrim", 1);

4
Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java
View file

@ -46,7 +46,7 @@ public class BurrentonForgeTenderTest extends CardTestPlayerBase {
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Flametongue Kavu");
addTarget(playerB, "Soldier of the Pantheon");
activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice {this}: Prevent all damage a red source of your choice would deal this turn.",
TestPlayer.NO_TARGET, "When {this} enters the battlefield, it deals 4 damage to target creature.");
TestPlayer.NO_TARGET, "When {this} enters, it deals 4 damage to target creature.");
playerA.addChoice("Flametongue Kavu");
setStopAt(2, PhaseStep.BEGIN_COMBAT);
@ -73,7 +73,7 @@ public class BurrentonForgeTenderTest extends CardTestPlayerBase {
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Flametongue Kavu");
addTarget(playerB, "Soldier of the Pantheon");
activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice {this}: Prevent all damage a red source of your choice would deal this turn.",
TestPlayer.NO_TARGET, "When {this} enters the battlefield, it deals 4 damage to target creature.");
TestPlayer.NO_TARGET, "When {this} enters, it deals 4 damage to target creature.");
playerA.addChoice("Flametongue Kavu");
castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Cloudshift", "Flametongue Kavu");

2
Mage.Tests/src/test/java/org/mage/test/cards/single/mom/InvasionOfAlaraTest.java
View file

@ -73,7 +73,7 @@ public class InvasionOfAlaraTest extends CardTestPlayerBase {
addTargetAmount(playerA, behemoth, 1);
// 3 chosen targets (max)
waitStackResolved(1, PhaseStep.POSTCOMBAT_MAIN, 1);
setChoice(playerA, "When {this} enters the battlefield, you gain"); // order triggers
setChoice(playerA, "When {this} enters, you gain"); // order triggers
addTarget(playerA, anthem); // to destroy
setStopAt(1, PhaseStep.END_TURN);

2
Mage.Tests/src/test/java/org/mage/test/cards/single/otj/FortuneLoyalSteedTest.java
View file

@ -35,7 +35,7 @@ public class FortuneLoyalSteedTest extends CardTestPlayerBase {
setChoice(playerA, "Lone Missionary"); // Choose to blink Lone Missionary
setChoice(playerA, "When {this} enters the battlefield, you gain 4 life"); // stack triggers
setChoice(playerA, "When {this} enters, you gain 4 life"); // stack triggers
addTarget(playerA, "Taiga"); // for the scry trigger
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);

3
Mage.Tests/src/test/java/org/mage/test/cards/single/tor/LaquatussChampionTest.java
View file

@ -6,7 +6,6 @@ import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author Quercitron
*/
public class LaquatussChampionTest extends CardTestPlayerBase {
@ -72,7 +71,7 @@ public class LaquatussChampionTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Laquatus's Champion");
addTarget(playerA, playerB);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terminate", "Laquatus's Champion", "enters the battlefield", StackClause.WHILE_ON_STACK);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terminate", "Laquatus's Champion", "enters", StackClause.WHILE_ON_STACK);
setStopAt(1, PhaseStep.END_TURN);
execute();

2
Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java
View file

@ -402,7 +402,7 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath with Escape");
setChoice(playerA, "Balduvian Bears^Balduvian Bears^Balduvian Bears^Balduvian Bears^Balduvian Bears");
setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must go first
setChoice(playerA, "When {this} enters, sacrifice it"); // sacrifice trigger must go first
setChoice(playerA, false); // do not put land to battlefield
// sacrifice trigger must found escape ability by getSpellOrLKIStack and keep uro on battlefield

2
Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java
View file

@ -63,7 +63,7 @@ public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelB
// order triggers to remove commander first
setChoice(playerA, "Whenever {this} enters the battlefield or attacks"); // draw trigger
setChoice(playerA, "Whenever another green creature enters the battlefield"); // get counters trigger
setChoice(playerA, "Whenever another green creature enters"); // get counters trigger
//setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must be on top
setChoice(playerA, true); // return commander to command zone