From 2f53477034df8b597641c54a02fbdf98f7c88986 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 18 Aug 2022 14:36:06 -0500 Subject: [PATCH] Shortened some test rig function names for clarity --- .../cards/official/set01/Card_01_019_Tests.java | 9 ++++----- .../cards/official/set01/Card_01_031_Tests.java | 6 +++--- .../cards/official/set01/Card_01_087_Tests.java | 6 +++--- .../cards/official/set03/Card_03_017_Tests.java | 8 ++++---- .../cards/official/set09/Card_09_039_Tests.java | 6 +++--- .../cards/official/set10/Card_10_030_Tests.java | 8 ++++---- .../pc/errata/set01/Card_01_040_ErrataTests.java | 12 ++++++------ .../pc/errata/set01/Card_01_045_ErrataTests.java | 2 +- .../pc/errata/set01/Card_01_080_ErrataTests.java | 9 ++++----- .../pc/errata/set01/Card_01_108_ErrataTests.java | 2 +- .../pc/errata/set01/Card_01_311_ErrataTests.java | 2 +- .../pc/errata/set01/Card_01_313_ErrataTests.java | 4 ++-- .../pc/errata/set03/Card_03_042_ErrataTests.java | 6 +++--- .../pc/errata/set03/Card_03_068_ErrataTests.java | 4 ++-- .../pc/vsets/set_v01/Card_V1_001_Tests.java | 16 ++++++++-------- .../pc/vsets/set_v01/Card_V1_019_Tests.java | 2 +- .../pc/vsets/set_v01/Card_V1_022_Tests.java | 6 +++--- .../pc/vsets/set_v01/Card_V1_025_Tests.java | 12 ++++++------ .../pc/vsets/set_v01/Card_V1_039_Tests.java | 4 ++-- .../pc/vsets/set_v01/Card_V1_055_Tests.java | 4 ++-- .../pc/vsets/set_v01/Card_V1_056_Tests.java | 6 +++--- 21 files changed, 66 insertions(+), 68 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_019_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_019_Tests.java index e01c45c86..8cd7f096e 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_019_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_019_Tests.java @@ -8,7 +8,6 @@ import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; import org.junit.Test; import java.util.HashMap; -import java.util.List; import static org.junit.Assert.*; @@ -86,7 +85,7 @@ public class Card_01_019_Tests assertEquals(Zone.SHADOW_CHARACTERS, runner1.getZone()); assertEquals(Zone.SHADOW_CHARACTERS, runner2.getZone()); - assertTrue(scn.FreepsCardPlayAvailable(balin)); + assertTrue(scn.FreepsPlayAvailable(balin)); scn.FreepsPlayCard(balin); assertTrue(scn.FreepsDecisionAvailable("Choose action")); @@ -120,7 +119,7 @@ public class Card_01_019_Tests assertEquals(Zone.SHADOW_CHARACTERS, scout.getZone()); assertEquals(0, scn.GetWoundsOn(scout)); - assertTrue(scn.FreepsCardPlayAvailable(balin)); + assertTrue(scn.FreepsPlayAvailable(balin)); scn.FreepsPlayCard(balin); assertEquals(1, scn.GetWoundsOn(gimli)); @@ -150,7 +149,7 @@ public class Card_01_019_Tests assertEquals(Zone.SHADOW_CHARACTERS, scout.getZone()); assertEquals(0, scn.GetWoundsOn(scout)); - assertTrue(scn.FreepsCardPlayAvailable(balin)); + assertTrue(scn.FreepsPlayAvailable(balin)); scn.FreepsPlayCard(balin); assertTrue(scn.FreepsDecisionAvailable("Choose action")); @@ -180,7 +179,7 @@ public class Card_01_019_Tests assertEquals(Zone.SHADOW_CHARACTERS, runner1.getZone()); assertEquals(0, scn.GetWoundsOn(runner1)); - assertTrue(scn.FreepsCardPlayAvailable(balin)); + assertTrue(scn.FreepsPlayAvailable(balin)); scn.FreepsPlayCard(balin); //https://wiki.lotrtcgpc.net/wiki/Comprehensive_Rules_4.1#effect diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_031_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_031_Tests.java index ec15b6311..75971a34b 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_031_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_031_Tests.java @@ -82,9 +82,9 @@ public class Card_01_031_Tests scn.StartGame(); - assertFalse(scn.FreepsCardPlayAvailable(asfaloth)); + assertFalse(scn.FreepsPlayAvailable(asfaloth)); scn.FreepsPlayCard(orophin); - assertTrue(scn.FreepsCardPlayAvailable(asfaloth)); + assertTrue(scn.FreepsPlayAvailable(asfaloth)); scn.FreepsPlayCard(arwen); scn.FreepsPlayCard(asfaloth); assertEquals(2, scn.GetFreepsCardChoiceCount()); // can go on either arwen or orophin @@ -210,7 +210,7 @@ public class Card_01_031_Tests scn.SkipToSite(3); assertEquals(0, scn.GetTwilight()); - assertTrue(scn.FreepsCardTransferAvailable(asfaloth)); + assertTrue(scn.FreepsTransferAvailable(asfaloth)); scn.FreepsTransferCard(asfaloth); scn.FreepsChooseCard(legolas); assertEquals(2, scn.GetTwilight()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_087_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_087_Tests.java index 9e0c50c66..15bcb8e0d 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_087_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_087_Tests.java @@ -76,7 +76,7 @@ public class Card_01_087_Tests scn.StartGame(); - assertTrue(scn.FreepsCardPlayAvailable(late)); + assertTrue(scn.FreepsPlayAvailable(late)); assertEquals(Zone.DECK, gandalf.getZone()); assertEquals(Zone.DECK, bb.getZone()); @@ -102,7 +102,7 @@ public class Card_01_087_Tests scn.StartGame(); - assertTrue(scn.FreepsCardPlayAvailable(late)); + assertTrue(scn.FreepsPlayAvailable(late)); assertEquals(Zone.DECK, gandalf.getZone()); assertEquals(Zone.DECK, bb.getZone()); @@ -127,7 +127,7 @@ public class Card_01_087_Tests scn.StartGame(); - assertTrue(scn.FreepsCardPlayAvailable(late)); + assertTrue(scn.FreepsPlayAvailable(late)); assertEquals(Zone.HAND, gandalf.getZone()); assertEquals(Zone.HAND, bb.getZone()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set03/Card_03_017_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set03/Card_03_017_Tests.java index b575e7c5a..ad75b7391 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set03/Card_03_017_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set03/Card_03_017_Tests.java @@ -123,7 +123,7 @@ public class Card_03_017_Tests scn.FreepsDeclineOptionalTrigger(); - assertTrue(scn.FreepsCardActionAvailable(galadriel)); + assertTrue(scn.FreepsActionAvailable(galadriel)); assertEquals(Zone.ADVENTURE_DECK, shadowSite2.getZone()); assertEquals(Zone.ADVENTURE_DECK, forestSite.getZone()); assertEquals(null, scn.GetSite(2)); @@ -152,7 +152,7 @@ public class Card_03_017_Tests scn.FreepsDeclineOptionalTrigger(); - assertTrue(scn.FreepsCardActionAvailable(galadriel)); + assertTrue(scn.FreepsActionAvailable(galadriel)); assertEquals(Zone.ADVENTURE_DECK, shadowSite2.getZone()); assertEquals(Zone.ADVENTURE_DECK, forestSite.getZone()); assertEquals(null, scn.GetSite(2)); @@ -184,7 +184,7 @@ public class Card_03_017_Tests scn.FreepsDeclineOptionalTrigger(); - assertTrue(scn.FreepsCardActionAvailable(galadriel)); + assertTrue(scn.FreepsActionAvailable(galadriel)); assertEquals(Zone.ADVENTURE_DECK, shadowSite2.getZone()); assertEquals(Zone.ADVENTURE_DECK, forestSite.getZone()); assertEquals(null, scn.GetSite(2)); @@ -215,7 +215,7 @@ public class Card_03_017_Tests scn.FreepsDeclineOptionalTrigger(); - assertTrue(scn.FreepsCardActionAvailable(galadriel)); + assertTrue(scn.FreepsActionAvailable(galadriel)); assertEquals(Zone.ADVENTURE_DECK, shadowSite2.getZone()); assertEquals(Zone.ADVENTURE_DECK, forestSite.getZone()); assertEquals(null, scn.GetSite(2)); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_039_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_039_Tests.java index 498f56b77..9553261ca 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_039_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_039_Tests.java @@ -85,7 +85,7 @@ public class Card_09_039_Tests scn.FreepsPassCurrentPhaseAction(); scn.ShadowPlayCard(library); - assertTrue(scn.ShadowCardActionAvailable(library)); + assertTrue(scn.ShadowActionAvailable(library)); assertEquals(5, scn.GetShadowDeckCount()); assertEquals(0, scn.GetStackedCards(library).size()); @@ -128,7 +128,7 @@ public class Card_09_039_Tests scn.FreepsResolveSkirmish(scn.GetRingBearer()); scn.FreepsPassCurrentPhaseAction(); - assertTrue(scn.ShadowCardActionAvailable(library)); + assertTrue(scn.ShadowActionAvailable(library)); // 20 initially, +2 from move, the rest were all cheated in assertEquals(22, scn.GetTwilight()); assertEquals(9, scn.GetStrength(troop1)); @@ -163,7 +163,7 @@ public class Card_09_039_Tests scn.SkipToPhase(Phase.REGROUP); scn.FreepsPassCurrentPhaseAction(); - assertTrue(scn.ShadowCardActionAvailable(library)); + assertTrue(scn.ShadowActionAvailable(library)); // 20 initially, +2 from move, the rest were all cheated in assertEquals(22, scn.GetTwilight()); assertEquals(0, scn.GetShadowHandCount()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set10/Card_10_030_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set10/Card_10_030_Tests.java index 9812ef9df..ef42aa616 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set10/Card_10_030_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set10/Card_10_030_Tests.java @@ -75,7 +75,7 @@ public class Card_10_030_Tests scn.FreepsResolveSkirmish(aragorn); //As Aragorn isn't exhausted (tho Frodo is), the event does nothing. - assertTrue(scn.FreepsCardPlayAvailable(endgame)); + assertTrue(scn.FreepsPlayAvailable(endgame)); assertEquals(8, scn.GetStrength(aragorn)); scn.FreepsPlayCard(endgame); assertEquals(8, scn.GetStrength(aragorn)); @@ -108,7 +108,7 @@ public class Card_10_030_Tests scn.FreepsAssignToMinions(aragorn, troop); scn.FreepsResolveSkirmish(aragorn); - assertTrue(scn.FreepsCardPlayAvailable(endgame)); + assertTrue(scn.FreepsPlayAvailable(endgame)); assertEquals(8, scn.GetStrength(aragorn)); scn.FreepsPlayCard(endgame); @@ -137,7 +137,7 @@ public class Card_10_030_Tests scn.FreepsAssignToMinions(aragorn, troop); scn.FreepsResolveSkirmish(aragorn); - assertTrue(scn.FreepsCardPlayAvailable(endgame)); + assertTrue(scn.FreepsPlayAvailable(endgame)); assertEquals(8, scn.GetStrength(aragorn)); scn.FreepsPlayCard(endgame); @@ -174,7 +174,7 @@ public class Card_10_030_Tests scn.FreepsAssignToMinions(aragorn, troop); scn.FreepsResolveSkirmish(aragorn); - assertTrue(scn.FreepsCardPlayAvailable(endgame)); + assertTrue(scn.FreepsPlayAvailable(endgame)); assertEquals(8, scn.GetStrength(aragorn)); scn.FreepsPlayCard(endgame); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_040_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_040_ErrataTests.java index 8e19140a6..ee1094411 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_040_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_040_ErrataTests.java @@ -88,7 +88,7 @@ public class Card_01_040_ErrataTests scn.StartGame(); assertEquals(Phase.FELLOWSHIP, scn.GetCurrentPhase()); - assertTrue(scn.FreepsCardActionAvailable(elrond)); + assertTrue(scn.FreepsActionAvailable(elrond)); assertEquals(0, scn.GetWoundsOn(elrond)); assertEquals(0, scn.GetFreepsHandCount()); @@ -114,7 +114,7 @@ public class Card_01_040_ErrataTests scn.StartGame(); assertEquals(Phase.FELLOWSHIP, scn.GetCurrentPhase()); - assertTrue(scn.FreepsCardActionAvailable(elrond)); + assertTrue(scn.FreepsActionAvailable(elrond)); assertEquals(0, scn.GetWoundsOn(elrond)); assertEquals(0, scn.GetFreepsHandCount()); @@ -140,10 +140,10 @@ public class Card_01_040_ErrataTests scn.StartGame(); assertEquals(Phase.FELLOWSHIP, scn.GetCurrentPhase()); - assertFalse(scn.FreepsCardPlayAvailable(elrond)); + assertFalse(scn.FreepsPlayAvailable(elrond)); scn.FreepsPlayCard(gandalf); - assertTrue(scn.FreepsCardPlayAvailable(elrond)); + assertTrue(scn.FreepsPlayAvailable(elrond)); } @Test @@ -159,10 +159,10 @@ public class Card_01_040_ErrataTests scn.StartGame(); assertEquals(Phase.FELLOWSHIP, scn.GetCurrentPhase()); - assertFalse(scn.FreepsCardPlayAvailable(elrond)); + assertFalse(scn.FreepsPlayAvailable(elrond)); scn.FreepsPlayCard(arwen); - assertTrue(scn.FreepsCardPlayAvailable(elrond)); + assertTrue(scn.FreepsPlayAvailable(elrond)); } @Test diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_045_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_045_ErrataTests.java index cbf5a2108..b9b228e5d 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_045_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_045_ErrataTests.java @@ -80,7 +80,7 @@ public class Card_01_045_ErrataTests scn.StartGame(); assertEquals(Phase.FELLOWSHIP, scn.GetCurrentPhase()); - assertTrue(scn.FreepsCardActionAvailable(galadriel)); + assertTrue(scn.FreepsActionAvailable(galadriel)); assertEquals(0, scn.GetWoundsOn(galadriel)); assertEquals(1, scn.GetFreepsHandCount()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_080_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_080_ErrataTests.java index 95e739557..e860a7a99 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_080_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_080_ErrataTests.java @@ -5,7 +5,6 @@ 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 com.gempukku.lotro.logic.modifiers.MoveLimitModifier; import org.junit.Test; import java.util.Arrays; @@ -81,9 +80,9 @@ public class Card_01_080_ErrataTests scn.FreepsMoveCardToHand(ottar, gandalf); scn.StartGame(); - assertFalse(scn.FreepsCardPlayAvailable(ottar)); + assertFalse(scn.FreepsPlayAvailable(ottar)); scn.FreepsPlayCard(gandalf); - assertTrue(scn.FreepsCardPlayAvailable(ottar)); + assertTrue(scn.FreepsPlayAvailable(ottar)); } @Test @@ -104,7 +103,7 @@ public class Card_01_080_ErrataTests assertEquals(Zone.HAND, chaff1.getZone()); assertEquals(Zone.DECK, chaff2.getZone()); assertEquals(1, scn.GetFreepsHandCount()); - assertTrue(scn.FreepsCardActionAvailable(ottar)); + assertTrue(scn.FreepsActionAvailable(ottar)); scn.FreepsUseCardAction(ottar); @@ -128,6 +127,6 @@ public class Card_01_080_ErrataTests assertEquals(0, scn.GetWoundsOn(ottar)); assertEquals(0, scn.GetFreepsHandCount()); - assertFalse(scn.FreepsCardActionAvailable(ottar)); + assertFalse(scn.FreepsActionAvailable(ottar)); } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_108_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_108_ErrataTests.java index 8176ed432..578da415a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_108_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_108_ErrataTests.java @@ -68,7 +68,7 @@ public class Card_01_108_ErrataTests scn.StartGame(); - assertTrue(scn.FreepsCardPlayAvailable(nostranger)); + assertTrue(scn.FreepsPlayAvailable(nostranger)); scn.FreepsPlayCard(nostranger); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_311_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_311_ErrataTests.java index a1e495804..7231a347f 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_311_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_311_ErrataTests.java @@ -69,7 +69,7 @@ public class Card_01_311_ErrataTests scn.StartGame(); assertEquals(Phase.FELLOWSHIP, scn.GetCurrentPhase()); - assertTrue(scn.FreepsCardActionAvailable(sam)); + assertTrue(scn.FreepsActionAvailable(sam)); assertEquals(0, scn.GetWoundsOn(sam)); assertEquals(0, scn.GetWoundsOn(frodo)); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_313_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_313_ErrataTests.java index a4d19df62..4dd334e04 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_313_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set01/Card_01_313_ErrataTests.java @@ -93,11 +93,11 @@ public class Card_01_313_ErrataTests scn.StartGame(); - assertTrue(scn.FreepsCardActionAvailable(sting)); + assertTrue(scn.FreepsActionAvailable(sting)); scn.SkipToPhase(Phase.REGROUP); - assertTrue(scn.FreepsCardActionAvailable(sting)); + assertTrue(scn.FreepsActionAvailable(sting)); } @Test diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_042_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_042_ErrataTests.java index 592ff7410..ab94c0739 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_042_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_042_ErrataTests.java @@ -85,9 +85,9 @@ public class Card_03_042_ErrataTests scn.StartGame(); - assertFalse(scn.FreepsCardPlayAvailable(horn)); + assertFalse(scn.FreepsPlayAvailable(horn)); scn.FreepsPlayCard(boromir); - assertTrue(scn.FreepsCardPlayAvailable(horn)); + assertTrue(scn.FreepsPlayAvailable(horn)); scn.FreepsPlayCard(horn); Assert.assertTrue(scn.IsAttachedTo(horn, boromir)); @@ -114,7 +114,7 @@ public class Card_03_042_ErrataTests scn.FreepsPlayCard(horn); scn.SkipToPhase(Phase.MANEUVER); - assertTrue(scn.FreepsCardActionAvailable(horn)); + assertTrue(scn.FreepsActionAvailable(horn)); scn.FreepsUseCardAction(horn); //discards diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_068_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_068_ErrataTests.java index a9d3453fb..5aa74f667 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_068_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_068_ErrataTests.java @@ -91,7 +91,7 @@ public class Card_03_068_ErrataTests assertFalse(scn.FreepsCanChooseCharacter(saruman)); scn.FreepsChooseCard(uruk1); - assertTrue(scn.ShadowCardActionAvailable(saruman)); + assertTrue(scn.ShadowActionAvailable(saruman)); //saruman blocks the uruk hit scn.ShadowUseCardAction(saruman); @@ -134,7 +134,7 @@ public class Card_03_068_ErrataTests scn.SkipToPhase(Phase.MANEUVER); scn.FreepsPassCurrentPhaseAction(); - assertTrue(scn.ShadowCardActionAvailable(saruman)); + assertTrue(scn.ShadowActionAvailable(saruman)); scn.ShadowUseCardAction(saruman); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_001_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_001_Tests.java index 3f46c3d8e..a2e690f59 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_001_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_001_Tests.java @@ -94,7 +94,7 @@ public class Card_V1_001_Tests //Site 2 scn.SkipToPhase(Phase.MANEUVER); - assertFalse(scn.FreepsCardActionAvailable(hosp)); + assertFalse(scn.FreepsActionAvailable(hosp)); scn.SkipToPhase(Phase.ASSIGNMENT); scn.PassCurrentPhaseActions(); @@ -105,7 +105,7 @@ public class Card_V1_001_Tests //Site 3 scn.SkipToPhase(Phase.MANEUVER); - assertFalse(scn.FreepsCardActionAvailable(hosp)); + assertFalse(scn.FreepsActionAvailable(hosp)); scn.SkipToPhase(Phase.ASSIGNMENT); scn.PassCurrentPhaseActions(); @@ -117,7 +117,7 @@ public class Card_V1_001_Tests //Site 4 scn.SkipToPhase(Phase.MANEUVER); - assertTrue(scn.FreepsCardActionAvailable(hosp)); + assertTrue(scn.FreepsActionAvailable(hosp)); scn.FreepsUseCardAction(hosp); assertFalse(scn.HasKeyword(gimli, Keyword.DAMAGE)); @@ -135,7 +135,7 @@ public class Card_V1_001_Tests //Site 5 scn.SkipToPhase(Phase.MANEUVER); - assertTrue(scn.FreepsCardActionAvailable(hosp)); + assertTrue(scn.FreepsActionAvailable(hosp)); scn.SkipToPhase(Phase.ASSIGNMENT); scn.PassCurrentPhaseActions(); @@ -152,7 +152,7 @@ public class Card_V1_001_Tests //Site 6 scn.SkipToPhase(Phase.MANEUVER); - assertTrue(scn.FreepsCardActionAvailable(hosp)); + assertTrue(scn.FreepsActionAvailable(hosp)); scn.SkipToPhase(Phase.ASSIGNMENT); scn.PassCurrentPhaseActions(); @@ -164,7 +164,7 @@ public class Card_V1_001_Tests //Site 7 scn.SkipToPhase(Phase.MANEUVER); - assertTrue(scn.FreepsCardActionAvailable(hosp)); + assertTrue(scn.FreepsActionAvailable(hosp)); scn.SkipToPhase(Phase.ASSIGNMENT); scn.PassCurrentPhaseActions(); @@ -176,7 +176,7 @@ public class Card_V1_001_Tests //Site 8 scn.SkipToPhase(Phase.MANEUVER); - assertTrue(scn.FreepsCardActionAvailable(hosp)); + assertTrue(scn.FreepsActionAvailable(hosp)); scn.SkipToPhase(Phase.ASSIGNMENT); scn.PassCurrentPhaseActions(); @@ -188,6 +188,6 @@ public class Card_V1_001_Tests //Site 5 scn.SkipToPhase(Phase.MANEUVER); - assertFalse(scn.FreepsCardActionAvailable(hosp)); + assertFalse(scn.FreepsActionAvailable(hosp)); } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_019_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_019_Tests.java index 147993fc3..ae3abaec0 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_019_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_019_Tests.java @@ -123,7 +123,7 @@ public class Card_V1_019_Tests scn.FreepsAssignToMinions(aragorn, runner); scn.FreepsResolveSkirmish(aragorn); - assertTrue(scn.FreepsCardActionAvailable(aragorn)); + assertTrue(scn.FreepsActionAvailable(aragorn)); assertEquals(Zone.HAND, defiance.getZone()); assertEquals(8, scn.GetStrength(aragorn)); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_022_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_022_Tests.java index ae0a49594..6a219ce74 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_022_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_022_Tests.java @@ -77,9 +77,9 @@ public class Card_V1_022_Tests scn.StartGame(); - assertFalse(scn.FreepsCardPlayAvailable(memorial)); + assertFalse(scn.FreepsPlayAvailable(memorial)); scn.FreepsPlayCard(aragorn); - assertTrue(scn.FreepsCardPlayAvailable(memorial)); + assertTrue(scn.FreepsPlayAvailable(memorial)); assertEquals(0, scn.GetWoundsOn(aragorn)); scn.FreepsPlayCard(memorial); @@ -126,7 +126,7 @@ public class Card_V1_022_Tests //There is already 1 burden from bidding, we add enough for 2 actions scn.AddBurdens(1); - assertTrue(scn.FreepsCardActionAvailable(memorial)); + assertTrue(scn.FreepsActionAvailable(memorial)); assertEquals(2, scn.GetBurdens()); assertEquals(0, scn.GetWoundsOn(aragorn)); assertEquals(0, scn.GetWoundsOn(sam)); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_025_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_025_Tests.java index f61a10600..058aa612a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_025_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_025_Tests.java @@ -168,7 +168,7 @@ public class Card_V1_025_Tests scn.SkipToPhase(Phase.MANEUVER); scn.FreepsPassCurrentPhaseAction(); // 1 wounded companion, no saruman - assertFalse(scn.ShadowCardActionAvailable(flock)); + assertFalse(scn.ShadowActionAvailable(flock)); scn.ShadowPassCurrentPhaseAction(); scn.SkipToPhase(Phase.REGROUP); @@ -181,7 +181,7 @@ public class Card_V1_025_Tests scn.SkipToPhase(Phase.MANEUVER); scn.FreepsPassCurrentPhaseAction(); // 2 wounded companions, no saruman - assertTrue(scn.ShadowCardActionAvailable(flock)); + assertTrue(scn.ShadowActionAvailable(flock)); scn.ShadowPassCurrentPhaseAction(); scn.SkipToPhase(Phase.REGROUP); @@ -196,7 +196,7 @@ public class Card_V1_025_Tests scn.SkipToPhase(Phase.MANEUVER); scn.FreepsPassCurrentPhaseAction(); // 0 wounded companions, yes saruman - assertTrue(scn.ShadowCardActionAvailable(flock)); + assertTrue(scn.ShadowActionAvailable(flock)); } @@ -226,7 +226,7 @@ public class Card_V1_025_Tests scn.SkipToPhase(Phase.MANEUVER); scn.FreepsPassCurrentPhaseAction(); - assertTrue(scn.ShadowCardActionAvailable(flock)); + assertTrue(scn.ShadowActionAvailable(flock)); assertEquals(Zone.DECK, weather1.getZone()); assertEquals(weather1, scn.GetShadowBottomOfDeck()); assertEquals(Zone.DISCARD, weather2.getZone()); @@ -250,7 +250,7 @@ public class Card_V1_025_Tests scn.SkipToPhase(Phase.MANEUVER); scn.FreepsPassCurrentPhaseAction(); - assertTrue(scn.ShadowCardActionAvailable(flock2)); + assertTrue(scn.ShadowActionAvailable(flock2)); assertEquals(Zone.DECK, weather1.getZone()); assertEquals(weather1, scn.GetShadowBottomOfDeck()); assertEquals(Zone.HAND, weather2.getZone()); // it was drawn during regroup @@ -275,7 +275,7 @@ public class Card_V1_025_Tests scn.SkipToPhase(Phase.MANEUVER); scn.FreepsPassCurrentPhaseAction(); - assertTrue(scn.ShadowCardActionAvailable(flock3)); + assertTrue(scn.ShadowActionAvailable(flock3)); assertEquals(Zone.DECK, weather1.getZone()); assertEquals(weather1, scn.GetShadowBottomOfDeck()); assertEquals(Zone.HAND, weather2.getZone()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_039_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_039_Tests.java index 7bc064f11..eb9f24566 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_039_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_039_Tests.java @@ -218,7 +218,7 @@ public class Card_V1_039_Tests assertEquals(11, scn.GetTwilight()); - assertTrue(scn.ShadowCardActionAvailable(crown)); + assertTrue(scn.ShadowActionAvailable(crown)); scn.ShadowUseCardAction(crown); assertEquals(10, scn.GetTwilight()); assertTrue(scn.ShadowDecisionAvailable("Choose cards to transfer to")); @@ -228,7 +228,7 @@ public class Card_V1_039_Tests scn.FreepsPassCurrentPhaseAction(); - assertTrue(scn.ShadowCardActionAvailable(crown2)); + assertTrue(scn.ShadowActionAvailable(crown2)); scn.ShadowUseCardAction(crown2); assertEquals(9, scn.GetTwilight()); assertEquals(4, scn.GetVitality(twigul1)); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_055_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_055_Tests.java index 63f3868fc..ba3bbb0a0 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_055_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_055_Tests.java @@ -92,7 +92,7 @@ public class Card_V1_055_Tests scn.FreepsAssignToMinions(boromir, runner); scn.FreepsResolveSkirmish(boromir); - assertTrue(scn.FreepsCardPlayAvailable(yet)); + assertTrue(scn.FreepsPlayAvailable(yet)); assertEquals(0, scn.GetWoundsOn(boromir)); assertEquals(7, scn.GetStrength(boromir)); @@ -126,7 +126,7 @@ public class Card_V1_055_Tests scn.FreepsAssignToMinions(sam, runner); scn.FreepsResolveSkirmish(sam); - assertFalse(scn.FreepsCardPlayAvailable(yet)); + assertFalse(scn.FreepsPlayAvailable(yet)); } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_056_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_056_Tests.java index a466bb272..6cf8d1820 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_056_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_056_Tests.java @@ -82,11 +82,11 @@ public class Card_V1_056_Tests scn.AddWoundsToChar(gimli, 1); scn.AddWoundsToChar(frodo, 1); - assertFalse(scn.FreepsCardPlayAvailable(coming)); + assertFalse(scn.FreepsPlayAvailable(coming)); scn.FreepsPlayCard(merry); - assertFalse(scn.FreepsCardPlayAvailable(coming)); + assertFalse(scn.FreepsPlayAvailable(coming)); scn.FreepsPlayCard(pippin); - assertTrue(scn.FreepsCardPlayAvailable(coming)); + assertTrue(scn.FreepsPlayAvailable(coming)); assertEquals(1, scn.GetWoundsOn(gimli)); assertEquals(1, scn.GetWoundsOn(frodo));