diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_016_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_016_Tests.java index fb149d8b1..866db546f 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_016_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_016_Tests.java @@ -3,7 +3,7 @@ package com.gempukku.lotro.cards.unofficial.pc.vsets.set_v02; 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.game.var; import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; import org.junit.Test; @@ -75,13 +75,13 @@ public class Card_V2_016_Tests // @Test public void ReducesFPsCulturesSpottedWhenThreeValiantCompanionsArePresent() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl veowyn = scn.GetFreepsCard("veowyn"); - PhysicalCardImpl vgamling = scn.GetFreepsCard("vgamling"); - PhysicalCardImpl vrscout = scn.GetFreepsCard("vrscout"); - PhysicalCardImpl gandalf = scn.GetFreepsCard("gandalf"); + var card = scn.GetFreepsCard("card"); + var veowyn = scn.GetFreepsCard("veowyn"); + var vgamling = scn.GetFreepsCard("vgamling"); + var vrscout = scn.GetFreepsCard("vrscout"); + var gandalf = scn.GetFreepsCard("gandalf"); scn.FreepsMoveCardToHand(card, veowyn, gandalf, vgamling, vrscout); scn.StartGame(); @@ -109,13 +109,13 @@ public class Card_V2_016_Tests @Test public void ExertsToBoostValiantCompanions() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl veowyn = scn.GetFreepsCard("veowyn"); + var card = scn.GetFreepsCard("card"); + var veowyn = scn.GetFreepsCard("veowyn"); scn.FreepsMoveCardToHand(card, veowyn); - PhysicalCardImpl twk = scn.GetShadowCard("twk"); + var twk = scn.GetShadowCard("twk"); scn.ShadowMoveCardToHand(twk); scn.StartGame(); @@ -168,13 +168,13 @@ public class Card_V2_016_Tests @Test public void CantExertToBoostNonValiantCompanions() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl gandalf = scn.GetFreepsCard("gandalf"); + var card = scn.GetFreepsCard("card"); + var gandalf = scn.GetFreepsCard("gandalf"); scn.FreepsMoveCardToHand(card, gandalf); - PhysicalCardImpl twk = scn.GetShadowCard("twk"); + var twk = scn.GetShadowCard("twk"); scn.ShadowMoveCardToHand(twk); scn.StartGame(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_017_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_017_Tests.java index d1111380f..0807d26f8 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_017_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_017_Tests.java @@ -55,7 +55,7 @@ public class Card_V2_017_Tests * Type: Event * Subtype: Maneuver * Game Text: Exert Aragorn three times to make each valiant companion strength +2 until the regroup phase. - * If Aragorn dies during this turn, make each valiant companion strength +1 for the rest of the turn. + * If Aragorn dies during this turn, make each valiant companion strength +1 for the rest of the turn. */ var scn = GetScenario(); @@ -94,9 +94,7 @@ public class Card_V2_017_Tests scn.SkipToPhase(Phase.MANEUVER); - //Need 4 vitality to exert 3 times. Testing when only 1 off ensures - // we don't have a typo of "exert twice" or "exert once" (which is the - // default number of times for the exert action). + //Need 4 vitality to exert 3 times. assertEquals(3, scn.GetVitality(aragorn)); assertFalse(scn.FreepsPlayAvailable(iwilldie)); @@ -116,13 +114,6 @@ public class Card_V2_017_Tests assertEquals(3, scn.GetWoundsOn(aragorn)); //Now that we have ensured that the costs of the card work as they should, // further tests can just worry about the effects without re-checking. - - //Typically we can skip testing for twilight going out unless it's variable - // or has some other sort of snag. The twilight-cost-of-a-card-is-paid part of - // the system could stand to be tested explicitly elsewhere, but it's so robust - // that at this point we can trust it and just ensure the twilight cost stat is - // set properly (as is done in the first test above), and then worry about things - // specific to this card. } @Test @@ -151,9 +142,7 @@ public class Card_V2_017_Tests assertTrue(scn.FreepsPlayAvailable(iwilldie)); - //When testing for strength changes, it's usually a good idea to check as - // closely to the occurrence as possible to eliminate the chance of false - // positives (site effects, character triggers, etc). + // Companion's all have expected strengths before iwilldie is played assertEquals(6, scn.GetStrength(veowyn)); assertEquals(6, scn.GetStrength(vgamling)); assertEquals(8, scn.GetStrength(aragorn)); @@ -206,10 +195,8 @@ public class Card_V2_017_Tests scn.SkipToPhase(Phase.MANEUVER); - assertEquals(0, scn.GetWoundsOn(aragorn)); assertTrue(scn.FreepsPlayAvailable(iwilldie)); scn.FreepsPlayCard(iwilldie); - assertEquals(3, scn.GetWoundsOn(aragorn)); // Valiant companion's strengths are boosted after card is played assertEquals(8, scn.GetStrength(veowyn)); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_018_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_018_Tests.java index 957f41d51..52fe03940 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_018_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_018_Tests.java @@ -49,9 +49,9 @@ public class Card_V2_018_Tests * At the start of the maneuver phase, you may add 2 threats to make a [gondor] companion defender +1 and strength +2 until the regroup phase (or add 1 threat if that companion is Boromir). */ - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); + var card = scn.GetFreepsCard("card"); assertEquals("Denethor", card.getBlueprint().getTitle()); assertEquals("Formidable Father", card.getBlueprint().getSubtitle()); @@ -70,11 +70,11 @@ public class Card_V2_018_Tests @Test public void gondorCompanionsAreDiminishedWhenThreatsAreFull() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl boromir = scn.GetFreepsCard("boromir"); - PhysicalCardImpl faramir = scn.GetFreepsCard("faramir"); + var card = scn.GetFreepsCard("card"); + var boromir = scn.GetFreepsCard("boromir"); + var faramir = scn.GetFreepsCard("faramir"); scn.FreepsMoveCardToHand(card, boromir, faramir); @@ -114,12 +114,12 @@ public class Card_V2_018_Tests @Test public void startOfManeuverTriggerCostTwoThreatsToBoostFaramir() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl boromir = scn.GetFreepsCard("boromir"); - PhysicalCardImpl faramir = scn.GetFreepsCard("faramir"); - PhysicalCardImpl twk = scn.GetShadowCard("twk"); + var card = scn.GetFreepsCard("card"); + var boromir = scn.GetFreepsCard("boromir"); + var faramir = scn.GetFreepsCard("faramir"); + var twk = scn.GetShadowCard("twk"); scn.FreepsMoveCardToHand(card, boromir, faramir, twk); @@ -157,12 +157,12 @@ public class Card_V2_018_Tests @Test public void startOfManeuverTriggerCostOneThreatToBoostBoromir() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl boromir = scn.GetFreepsCard("boromir"); - PhysicalCardImpl faramir = scn.GetFreepsCard("faramir"); - PhysicalCardImpl twk = scn.GetShadowCard("twk"); + var card = scn.GetFreepsCard("card"); + var boromir = scn.GetFreepsCard("boromir"); + var faramir = scn.GetFreepsCard("faramir"); + var twk = scn.GetShadowCard("twk"); scn.FreepsMoveCardToHand(card, boromir, faramir, twk); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_019_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_019_Tests.java index 0dd856b57..b1c1a7d84 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_019_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_019_Tests.java @@ -73,12 +73,12 @@ public class Card_V2_019_Tests @Test public void dumpsAGondorCardToWoundRoamingNonManMinionSkirmishingHimOnce() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl rangerComp = scn.GetFreepsCard("rangerComp"); - PhysicalCardImpl gondorCardToChuck = scn.GetFreepsCard("gondorCardToChuck"); - PhysicalCardImpl threeVitNonMan = scn.GetShadowCard("threeVitNonMan"); + var card = scn.GetFreepsCard("card"); + var rangerComp = scn.GetFreepsCard("rangerComp"); + var gondorCardToChuck = scn.GetFreepsCard("gondorCardToChuck"); + var threeVitNonMan = scn.GetShadowCard("threeVitNonMan"); scn.FreepsMoveCardToHand(card, rangerComp, gondorCardToChuck); scn.ShadowMoveCardToHand(threeVitNonMan); @@ -113,12 +113,12 @@ public class Card_V2_019_Tests @Test public void dumpsAGondorCardToWoundRoamingManMinionSkirmishingHimTwice() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl rangerComp = scn.GetFreepsCard("rangerComp"); - PhysicalCardImpl gondorCardToChuck = scn.GetFreepsCard("gondorCardToChuck"); - PhysicalCardImpl threeVitMan = scn.GetShadowCard("threeVitMan"); + var card = scn.GetFreepsCard("card"); + var rangerComp = scn.GetFreepsCard("rangerComp"); + var gondorCardToChuck = scn.GetFreepsCard("gondorCardToChuck"); + var threeVitMan = scn.GetShadowCard("threeVitMan"); scn.FreepsMoveCardToHand(card, rangerComp, gondorCardToChuck); scn.ShadowMoveCardToHand(threeVitMan); @@ -153,12 +153,12 @@ public class Card_V2_019_Tests @Test public void dumpsAGondorCardForNoEffectAgainstNonRoamingMinion() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl rangerComp = scn.GetFreepsCard("rangerComp"); - PhysicalCardImpl gondorCardToChuck = scn.GetFreepsCard("gondorCardToChuck"); - PhysicalCardImpl nonRoamingMinion = scn.GetShadowCard("nonRoamingMinion"); + var card = scn.GetFreepsCard("card"); + var rangerComp = scn.GetFreepsCard("rangerComp"); + var gondorCardToChuck = scn.GetFreepsCard("gondorCardToChuck"); + var nonRoamingMinion = scn.GetShadowCard("nonRoamingMinion"); scn.FreepsMoveCardToHand(card, rangerComp, gondorCardToChuck); scn.ShadowMoveCardToHand(nonRoamingMinion); @@ -194,12 +194,12 @@ public class Card_V2_019_Tests @Test public void dumpsAGondorCardForNoEffectWhenRoamingMinionIsSkirmishingOtherCompanion() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup - GenericCardTestHelper scn = GetScenario(); + var scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - PhysicalCardImpl rangerComp = scn.GetFreepsCard("rangerComp"); - PhysicalCardImpl gondorCardToChuck = scn.GetFreepsCard("gondorCardToChuck"); - PhysicalCardImpl threeVitMan = scn.GetShadowCard("threeVitMan"); + var card = scn.GetFreepsCard("card"); + var rangerComp = scn.GetFreepsCard("rangerComp"); + var gondorCardToChuck = scn.GetFreepsCard("gondorCardToChuck"); + var threeVitMan = scn.GetShadowCard("threeVitMan"); scn.FreepsMoveCardToHand(card, rangerComp, gondorCardToChuck); scn.ShadowMoveCardToHand(threeVitMan);