From a6f7de98844a2ec4e9f7feb39f0bf5216e6ba5e5 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 2 Jun 2024 13:18:46 -0500 Subject: [PATCH] V2 timeword test fixes --- .../cards/unofficial/pc/vsets/set_v02/Card_V2_004_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_006_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_010_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_017_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_018_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_030_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_040_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_045_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_050_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_056_Tests.java | 2 +- .../cards/unofficial/pc/vsets/set_v02/Card_V2_059_Tests.java | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_004_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_004_Tests.java index 40bd6a94f..51bdd6c03 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_004_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_004_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_004_Tests assertEquals(Side.SHADOW, card.getBlueprint().getSide()); assertEquals(Culture.DUNLAND, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.SHADOW)); + assertTrue(scn.hasTimeword(card, Timeword.SHADOW)); assertEquals(1, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_006_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_006_Tests.java index 45fc31ab2..4ac8103df 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_006_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_006_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_006_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.ELVEN, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.ARCHERY)); + assertTrue(scn.hasTimeword(card, Timeword.ARCHERY)); assertEquals(0, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java index b9fc65d15..121f97324 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java @@ -61,7 +61,7 @@ public class Card_V2_008_Tests assertEquals(2, card.getBlueprint().getTwilightCost()); assertEquals(6, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); - assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(FELLOWSHIP, 3))); + assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.FELLOWSHIP, 3))); } // Uncomment any @Test markers below once this is ready to be used diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_010_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_010_Tests.java index 20f1b5b14..0f6b0292f 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_010_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_010_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_010_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.ELVEN, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.MANEUVER)); + assertTrue(scn.hasTimeword(card, Timeword.MANEUVER)); assertEquals(2, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java index 3a0afa291..1c6450ea1 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_011_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.ELVEN, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.FELLOWSHIP)); + assertTrue(scn.hasTimeword(card, Timeword.FELLOWSHIP)); assertEquals(1, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java index d8f854eb7..6b1e37ef9 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_015_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.GANDALF, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.MANEUVER)); + assertTrue(scn.hasTimeword(card, Timeword.MANEUVER)); assertEquals(2, card.getBlueprint().getTwilightCost()); } 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 0807d26f8..dab69fde9 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 @@ -68,7 +68,7 @@ public class Card_V2_017_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.GONDOR, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.HasKeyword(card, Keyword.MANEUVER)); + assertTrue(scn.hasTimeword(card, Timeword.MANEUVER)); assertEquals(1, card.getBlueprint().getTwilightCost()); } 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 6a663339f..2d29ed7b9 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 @@ -63,7 +63,7 @@ public class Card_V2_018_Tests assertEquals(3, card.getBlueprint().getTwilightCost()); assertEquals(5, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); - assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(KING, 3))); + assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.KING, 3))); } @Test diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_030_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_030_Tests.java index 7a014ed46..7a1660086 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_030_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_030_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_030_Tests assertEquals(Side.SHADOW, card.getBlueprint().getSide()); assertEquals(Culture.ISENGARD, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.ASSIGNMENT)); + assertTrue(scn.hasTimeword(card, Timeword.ASSIGNMENT)); assertEquals(2, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_040_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_040_Tests.java index f209bb5f7..6f5e29343 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_040_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_040_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_040_Tests assertEquals(Side.SHADOW, card.getBlueprint().getSide()); assertEquals(Culture.MORIA, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.REGROUP)); + assertTrue(scn.hasTimeword(card, Timeword.REGROUP)); assertEquals(1, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_045_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_045_Tests.java index 241306ad2..beae53117 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_045_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_045_Tests.java @@ -60,7 +60,7 @@ public class Card_V2_045_Tests assertEquals(2, card.getBlueprint().getTwilightCost()); assertEquals(3, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); - assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(TWO_TOWERS, 3))); + assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.TWO_TOWERS, 3))); } // Uncomment any @Test markers below once this is ready to be used diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_050_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_050_Tests.java index ee3fd4fa1..de5c29da6 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_050_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_050_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_050_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.ROHAN, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.ASSIGNMENT)); + assertTrue(scn.hasTimeword(card, Timeword.ASSIGNMENT)); assertEquals(2, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java index 60ff5064c..ec871984a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_051_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.ROHAN, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.SKIRMISH)); + assertTrue(scn.hasTimeword(card, Timeword.SKIRMISH)); assertEquals(0, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java index 6891eadcf..a2bd67173 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_053_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.ROHAN, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.SKIRMISH)); + assertTrue(scn.hasTimeword(card, Timeword.SKIRMISH)); assertEquals(2, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_056_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_056_Tests.java index 18f311f48..dcc01f21a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_056_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_056_Tests.java @@ -52,7 +52,7 @@ public class Card_V2_056_Tests assertEquals(Side.SHADOW, card.getBlueprint().getSide()); assertEquals(Culture.SAURON, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.SKIRMISH)); + assertTrue(scn.hasTimeword(card, Timeword.SKIRMISH)); assertEquals(0, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_059_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_059_Tests.java index 8c23a2439..3fa39183e 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_059_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_059_Tests.java @@ -53,7 +53,7 @@ public class Card_V2_059_Tests assertEquals(Side.SHADOW, card.getBlueprint().getSide()); assertEquals(Culture.SAURON, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Keyword.SKIRMISH)); + assertTrue(scn.hasTimeword(card, Timeword.SKIRMISH)); assertTrue(scn.hasKeyword(card, Keyword.SEARCH)); assertEquals(1, card.getBlueprint().getTwilightCost()); }