github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-28 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix test failure

Browse source
This commit is contained in:
Evan Kranzler 2022-10-15 10:56:39 -04:00
parent d8e3233cde
commit fb11a59099
2 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java
View file

@ -358,7 +358,7 @@ public class ConditionalManaTest extends CardTestPlayerBase {
} }
@Test @Test
public void testTwoConditionalMana(){ public void testTwoConditionalMana() {
setStrictChooseMode(true); setStrictChooseMode(true);
// At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard. // At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.
@ -371,9 +371,6 @@ public class ConditionalManaTest extends CardTestPlayerBase {
addCard(Zone.GRAVEYARD, playerA, "Grizzly Bears", 2); addCard(Zone.GRAVEYARD, playerA, "Grizzly Bears", 2);
setChoice(playerA, false); // Put [Top Card of Library] into your graveyard?
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute(); execute();
@ -382,9 +379,9 @@ public class ConditionalManaTest extends CardTestPlayerBase {
ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame);
Assert.assertEquals("mana variations don't fit", 4, manaOptions.size()); Assert.assertEquals("mana variations don't fit", 4, manaOptions.size());
assertManaOptions("{R}", manaOptions); assertManaOptions("{R}", manaOptions);
assertManaOptions("{C}{C}{R}[{TitansNestManaCondition}]", manaOptions); assertManaOptions("{C}{C}{C}{R}[{TitansNestManaCondition}]", manaOptions);
assertManaOptions("{C}{C}{C}{C}{R}[{RosheenMeandererManaCondition}]", manaOptions); assertManaOptions("{C}{C}{C}{C}{R}[{RosheenMeandererManaCondition}]", manaOptions);
assertManaOptions("{C}{C}{C}{C}{C}{C}{R}[{RosheenMeandererManaCondition}{TitansNestManaCondition}]", manaOptions); assertManaOptions("{C}{C}{C}{C}{C}{C}{C}{R}[{RosheenMeandererManaCondition}{TitansNestManaCondition}]", manaOptions);
} }
@Test @Test

7
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -5015,7 +5015,7 @@ public abstract class PlayerImpl implements Player, Serializable {
+ " to PUT on the BOTTOM of your library (Scry)")); + " to PUT on the BOTTOM of your library (Scry)"));
chooseTarget(Outcome.Benefit, cards, target, source, game); chooseTarget(Outcome.Benefit, cards, target, source, game);
putCardsOnBottomOfLibrary(new CardsImpl(target.getTargets()), game, source, true); putCardsOnBottomOfLibrary(new CardsImpl(target.getTargets()), game, source, true);
cards.removeAll(target.getTargets()); cards.retainZone(Zone.LIBRARY, game);
putCardsOnTopOfLibrary(cards, game, source, true); putCardsOnTopOfLibrary(cards, game, source, true);
} }
game.fireEvent(new GameEvent(GameEvent.EventType.SCRIED, getId(), source, getId(), event.getAmount(), true)); game.fireEvent(new GameEvent(GameEvent.EventType.SCRIED, getId(), source, getId(), event.getAmount(), true));
@ -5033,10 +5033,11 @@ public abstract class PlayerImpl implements Player, Serializable {
cards.addAll(getLibrary().getTopCards(game, event.getAmount())); cards.addAll(getLibrary().getTopCards(game, event.getAmount()));
if (!cards.isEmpty()) { if (!cards.isEmpty()) {
TargetCard target = new TargetCard(0, cards.size(), Zone.LIBRARY, TargetCard target = new TargetCard(0, cards.size(), Zone.LIBRARY,
new FilterCard("cards to PUT into your GRAVEYARD (Surveil)")); new FilterCard("card " + (cards.size() == 1 ? "" : "s")
+ " to PUT into your GRAVEYARD (Surveil)"));
chooseTarget(Outcome.Benefit, cards, target, source, game); chooseTarget(Outcome.Benefit, cards, target, source, game);
moveCards(new CardsImpl(target.getTargets()), Zone.GRAVEYARD, source, game); moveCards(new CardsImpl(target.getTargets()), Zone.GRAVEYARD, source, game);
cards.removeAll(target.getTargets()); cards.retainZone(Zone.LIBRARY, game);
putCardsOnTopOfLibrary(cards, game, source, true); putCardsOnTopOfLibrary(cards, game, source, true);
} }
game.fireEvent(new GameEvent(GameEvent.EventType.SURVEILED, getId(), source, getId(), event.getAmount(), true)); game.fireEvent(new GameEvent(GameEvent.EventType.SURVEILED, getId(), source, getId(), event.getAmount(), true));