diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson index a4d711de7..67fa1d5bb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson @@ -1420,7 +1420,7 @@ effects: [ { type: assignmentCost - text: Would you like to exert a companion to be able to assign Morgul Spawn to skirmish? + text: Would you like to exert a companion to be able to assign Morgul Spearman to skirmish? requires: { type: canSpot filter: nazgul diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_197_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_197_Tests.java index f1c0fe43f..2d8646f2a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_197_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_197_Tests.java @@ -9,6 +9,7 @@ import org.junit.Test; import java.util.HashMap; +import static com.gempukku.lotro.at.AbstractAtTest.P1; import static org.junit.Assert.*; public class Card_07_197_Tests @@ -19,7 +20,7 @@ public class Card_07_197_Tests new HashMap<>() {{ put("card", "7_197"); - // put other cards in here as needed for the test case + put("enquea", "1_231"); }}, GenericCardTestHelper.FellowshipSites, GenericCardTestHelper.FOTRFrodo, @@ -62,18 +63,38 @@ public class Card_07_197_Tests assertEquals(4, card.getBlueprint().getSiteNumber()); } - // Uncomment any @Test markers below once this is ready to be used - //@Test - public void MorgulRegimentTest1() throws DecisionResultInvalidException, CardNotFoundException { - //Pre-game setup - var scn = GetScenario(); + @Test + public void MustExertToAssignMorgulRegiment() throws DecisionResultInvalidException, CardNotFoundException { + // Arrange + GenericCardTestHelper scn = GetScenario(); - var card = scn.GetFreepsCard("card"); - scn.FreepsMoveCardToHand(card); + var card = scn.GetShadowCard("card"); + var enquea = scn.GetShadowCard("enquea"); + var frodo = scn.GetRingBearer(); + + scn.ShadowMoveCardToHand(card); + scn.ShadowMoveCardToHand(enquea); scn.StartGame(); - scn.FreepsPlayCard(card); - assertEquals(7, scn.GetTwilight()); + scn.SetTwilight(20); + + scn.FreepsPassCurrentPhaseAction(); + + scn.ShadowPlayCard(card); + scn.ShadowPlayCard(enquea); + scn.ShadowPassCurrentPhaseAction(); + + scn.SkipToAssignments(); + + assertTrue(scn.FreepsDecisionAvailable( + "Would you like to exert a companion for each Nazgûl you can spot to be able to assign Morgul Regiment to skirmish?")); + + // Act + scn.playerDecided(P1, "0"); + + // Assert + assertEquals(1, scn.GetWoundsOn(frodo)); + assertTrue(scn.FreepsCanAssign(card)); } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_200_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_200_Tests.java index c40097b7f..175b3a302 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_200_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_200_Tests.java @@ -3,12 +3,12 @@ package com.gempukku.lotro.cards.official.set07; import com.gempukku.lotro.cards.GenericCardTestHelper; import com.gempukku.lotro.common.*; import com.gempukku.lotro.game.CardNotFoundException; -import com.gempukku.lotro.game.PhysicalCardImpl; import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; import org.junit.Test; import java.util.HashMap; +import static com.gempukku.lotro.at.AbstractAtTest.P1; import static org.junit.Assert.*; public class Card_07_200_Tests @@ -19,7 +19,7 @@ public class Card_07_200_Tests new HashMap<>() {{ put("card", "7_200"); - // put other cards in here as needed for the test case + put("enquea", "1_231"); }}, GenericCardTestHelper.FellowshipSites, GenericCardTestHelper.FOTRFrodo, @@ -62,18 +62,38 @@ public class Card_07_200_Tests assertEquals(4, card.getBlueprint().getSiteNumber()); } - // Uncomment any @Test markers below once this is ready to be used - //@Test - public void MorgulSpawnTest1() throws DecisionResultInvalidException, CardNotFoundException { - //Pre-game setup - var scn = GetScenario(); + @Test + public void MustExertToAssignMorgulSpawn() throws DecisionResultInvalidException, CardNotFoundException { + // Arrange + GenericCardTestHelper scn = GetScenario(); - var card = scn.GetFreepsCard("card"); - scn.FreepsMoveCardToHand(card); + var card = scn.GetShadowCard("card"); + var enquea = scn.GetShadowCard("enquea"); + var frodo = scn.GetRingBearer(); + + scn.ShadowMoveCardToHand(card); + scn.ShadowMoveCardToHand(enquea); scn.StartGame(); - scn.FreepsPlayCard(card); - assertEquals(4, scn.GetTwilight()); + scn.SetTwilight(20); + + scn.FreepsPassCurrentPhaseAction(); + + scn.ShadowPlayCard(card); + scn.ShadowPlayCard(enquea); + scn.ShadowPassCurrentPhaseAction(); + + scn.SkipToAssignments(); + + assertTrue(scn.FreepsDecisionAvailable( + "Would you like to exert a companion to be able to assign Morgul Spawn to skirmish?")); + + // Act + scn.playerDecided(P1, "0"); + + // Assert + assertEquals(1, scn.GetWoundsOn(frodo)); + assertTrue(scn.FreepsCanAssign(card)); } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_201_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_201_Tests.java index a93437712..adf83a3d1 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_201_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_201_Tests.java @@ -9,6 +9,7 @@ import org.junit.Test; import java.util.HashMap; +import static com.gempukku.lotro.at.AbstractAtTest.P1; import static org.junit.Assert.*; public class Card_07_201_Tests @@ -19,7 +20,7 @@ public class Card_07_201_Tests new HashMap<>() {{ put("card", "7_201"); - // put other cards in here as needed for the test case + put("enquea", "1_231"); }}, GenericCardTestHelper.FellowshipSites, GenericCardTestHelper.FOTRFrodo, @@ -62,18 +63,38 @@ public class Card_07_201_Tests assertEquals(4, card.getBlueprint().getSiteNumber()); } - // Uncomment any @Test markers below once this is ready to be used - //@Test - public void MorgulSpearmanTest1() throws DecisionResultInvalidException, CardNotFoundException { - //Pre-game setup - var scn = GetScenario(); + @Test + public void MustExertToAssignMorgulSpearman() throws DecisionResultInvalidException, CardNotFoundException { + // Arrange + GenericCardTestHelper scn = GetScenario(); - var card = scn.GetFreepsCard("card"); - scn.FreepsMoveCardToHand(card); + var card = scn.GetShadowCard("card"); + var enquea = scn.GetShadowCard("enquea"); + var frodo = scn.GetRingBearer(); + + scn.ShadowMoveCardToHand(card); + scn.ShadowMoveCardToHand(enquea); scn.StartGame(); - scn.FreepsPlayCard(card); - assertEquals(2, scn.GetTwilight()); + scn.SetTwilight(20); + + scn.FreepsPassCurrentPhaseAction(); + + scn.ShadowPlayCard(card); + scn.ShadowPlayCard(enquea); + scn.ShadowPassCurrentPhaseAction(); + + scn.SkipToAssignments(); + + assertTrue(scn.FreepsDecisionAvailable( + "Would you like to exert a companion to be able to assign Morgul Spearman to skirmish?")); + + // Act + scn.playerDecided(P1, "0"); + + // Assert + assertEquals(1, scn.GetWoundsOn(frodo)); + assertTrue(scn.FreepsCanAssign(card)); } }