From d5dd25435aa6b9a97e4fe91def09ca5590883d5c Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 2 Jun 2024 12:56:52 -0500 Subject: [PATCH] V2 test upgrades --- .../unofficial/pc/vsets/set_v02/Card_V2_005_Tests.java | 2 ++ .../unofficial/pc/vsets/set_v02/Card_V2_007_Tests.java | 6 +++--- .../unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java | 5 ++--- .../unofficial/pc/vsets/set_v02/Card_V2_013_Tests.java | 2 +- .../unofficial/pc/vsets/set_v02/Card_V2_014_Tests.java | 2 ++ .../unofficial/pc/vsets/set_v02/Card_V2_016_Tests.java | 5 +++-- .../unofficial/pc/vsets/set_v02/Card_V2_019_Tests.java | 2 ++ .../unofficial/pc/vsets/set_v02/Card_V2_026_Tests.java | 4 ++-- .../unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java | 2 ++ .../unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java | 2 ++ .../unofficial/pc/vsets/set_v02/Card_V2_045_Tests.java | 3 +-- .../unofficial/pc/vsets/set_v02/Card_V2_049_Tests.java | 2 +- .../unofficial/pc/vsets/set_v02/Card_V2_052_Tests.java | 2 +- .../unofficial/pc/vsets/set_v02/Card_V2_071_Tests.java | 2 +- 14 files changed, 25 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_005_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_005_Tests.java index 2d3eff380..51695f35a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_005_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_005_Tests.java @@ -43,6 +43,7 @@ public class Card_V2_005_Tests * Subtype: Elf * Strength: 6 * Vitality: 3 + * Resistance: 6 * Game Text: Valiant. * While Haldir bears a ranged weapon, each valiant Elf is strength +1 and does not add to the fellowship archery total. * Each time an [elven] possession is about to be discarded by a card effect, you may exert Haldir to prevent that. @@ -63,6 +64,7 @@ public class Card_V2_005_Tests assertEquals(2, card.getBlueprint().getTwilightCost()); assertEquals(6, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); + assertEquals(6, card.getBlueprint().getResistance()); } //@Test diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_007_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_007_Tests.java index 0c509f188..1f7182be7 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_007_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_007_Tests.java @@ -41,7 +41,7 @@ public class Card_V2_007_Tests * Subtype: Hand/ranged weapon * Strength: 2 * Vitality: 1 - * Game Text: Bearer must a valiant Elf. + * Game Text: Bearer must be a valiant Elf. * Each time bearer wins a skirmish, you may exert bearer to heal another valiant Elf. */ @@ -58,8 +58,8 @@ public class Card_V2_007_Tests assertTrue(card.getBlueprint().getPossessionClasses().contains(PossessionClass.HAND_WEAPON)); assertTrue(card.getBlueprint().getPossessionClasses().contains(PossessionClass.RANGED_WEAPON)); assertEquals(2, card.getBlueprint().getTwilightCost()); - assertEquals(+2, card.getBlueprint().getStrength()); - assertEquals(+1, card.getBlueprint().getVitality()); + assertEquals(2, card.getBlueprint().getStrength()); + assertEquals(1, card.getBlueprint().getVitality()); } // 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_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 e0dddd032..b9fc65d15 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 @@ -41,7 +41,7 @@ public class Card_V2_008_Tests * Subtype: Elf * Strength: 6 * Vitality: 3 - * Site Number: 3 + * Site Number: 3F * Game Text: Aragorn is strength +1. * If Aragorn is about to be killed you may exert Arwen to heal Aragorn. * While Arwen is exhausted, Aragorn is defender +1. @@ -61,8 +61,7 @@ public class Card_V2_008_Tests assertEquals(2, card.getBlueprint().getTwilightCost()); assertEquals(6, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); - assertEquals(3, card.getBlueprint().getAllyHomeSiteNumbers()[0]); - assertEquals(SitesBlock.FELLOWSHIP, card.getBlueprint().getAllyHomeSiteBlock()); + assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(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_013_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_013_Tests.java index 8c0b07c9a..a8e5920e3 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_013_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_013_Tests.java @@ -55,7 +55,7 @@ public class Card_V2_013_Tests assertEquals(Culture.GANDALF, card.getBlueprint().getCulture()); assertEquals(CardType.CONDITION, card.getBlueprint().getCardType()); assertEquals(1, card.getBlueprint().getTwilightCost()); - assertEquals(+1, card.getBlueprint().getStrength()); + assertEquals(1, card.getBlueprint().getStrength()); } // 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_014_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_014_Tests.java index 7c2cbb55b..fbd7336e9 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_014_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_014_Tests.java @@ -41,6 +41,7 @@ public class Card_V2_014_Tests * Subtype: Wizard * Strength: 7 * Vitality: 4 + * Resistance: 6 * Signet: Theoden * Game Text: Theoden is strength +1. * Each mounted companion gains valiant. @@ -61,6 +62,7 @@ public class Card_V2_014_Tests assertEquals(4, card.getBlueprint().getTwilightCost()); assertEquals(7, card.getBlueprint().getStrength()); assertEquals(4, card.getBlueprint().getVitality()); + assertEquals(6, card.getBlueprint().getResistance()); assertEquals(Signet.THEODEN, card.getBlueprint().getSignet()); } 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 866db546f..034aead30 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.var; +import com.gempukku.lotro.game.PhysicalCardImpl; import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; import org.junit.Test; @@ -47,6 +47,7 @@ public class Card_V2_016_Tests * Subtype: Man * Strength: 7 * Vitality: 4 + * Resistance: 6 * Signet: Theoden * Game Text: Valiant. * While you can spot 3 valiant companions, the number of free peoples cultures that can be counted is-1. @@ -72,7 +73,7 @@ public class Card_V2_016_Tests assertEquals(Signet.THEODEN, card.getBlueprint().getSignet()); } - // @Test + //@Test public void ReducesFPsCulturesSpottedWhenThreeValiantCompanionsArePresent() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup var scn = GetScenario(); 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 b1c1a7d84..845424d42 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 @@ -46,6 +46,7 @@ public class Card_V2_019_Tests * Subtype: Man * Strength: 6 * Vitality: 3 + * Resistance: 6 * Signet: Frodo * Game Text: Ranger. To play, spot a ranger. * Skirmish: Discard a [Gondor] card from hand to wound a roaming minion skirmishing this companion. If that minion is a Man, wound it again. @@ -66,6 +67,7 @@ public class Card_V2_019_Tests assertEquals(3, card.getBlueprint().getTwilightCost()); assertEquals(6, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); + assertEquals(6, card.getBlueprint().getResistance()); assertEquals(Signet.FRODO, card.getBlueprint().getSignet()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_026_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_026_Tests.java index d90e9477d..0dbb7e2a5 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_026_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_026_Tests.java @@ -57,8 +57,8 @@ public class Card_V2_026_Tests assertEquals(CardType.POSSESSION, card.getBlueprint().getCardType()); assertTrue(card.getBlueprint().getPossessionClasses().contains(PossessionClass.MOUNT)); assertEquals(2, card.getBlueprint().getTwilightCost()); - assertEquals(+1, card.getBlueprint().getStrength()); - assertEquals(+1, card.getBlueprint().getVitality()); + assertEquals(1, card.getBlueprint().getStrength()); + assertEquals(1, card.getBlueprint().getVitality()); } // 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_043_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java index 43d692f5b..2f057deb3 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java @@ -41,6 +41,7 @@ public class Card_V2_043_Tests * Subtype: Man * Strength: 6 * Vitality: 3 + * Resistance: 6 * Signet: Theoden * Game Text: Valiant. * Theoden is strength +1 for each valiant companion assigned to a skirmish. @@ -61,6 +62,7 @@ public class Card_V2_043_Tests assertEquals(3, card.getBlueprint().getTwilightCost()); assertEquals(6, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); + assertEquals(6, card.getBlueprint().getResistance()); assertEquals(Signet.THEODEN, card.getBlueprint().getSignet()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java index f950efadd..d8a610f2d 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java @@ -41,6 +41,7 @@ public class Card_V2_044_Tests * Subtype: Man * Strength: 7 * Vitality: 3 + * Resistance: 6 * Signet: Gandalf * Game Text: When you play Erkenbrand, remove up to 3 non-unique [rohan] companions in the dead pile from the game. * Each exhausted companion gains valiant. @@ -60,6 +61,7 @@ public class Card_V2_044_Tests assertEquals(5, card.getBlueprint().getTwilightCost()); assertEquals(7, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); + assertEquals(6, card.getBlueprint().getResistance()); assertEquals(Signet.GANDALF, card.getBlueprint().getSignet()); } 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 7b66079f4..241306ad2 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,8 +60,7 @@ public class Card_V2_045_Tests assertEquals(2, card.getBlueprint().getTwilightCost()); assertEquals(3, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); - assertEquals(3, card.getBlueprint().getAllyHomeSiteNumbers()[0]); - assertEquals(SitesBlock.TWO_TOWERS, card.getBlueprint().getAllyHomeSiteBlock()); + assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(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_049_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_049_Tests.java index 58c2db2ca..ea7bb6f06 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_049_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_049_Tests.java @@ -57,7 +57,7 @@ public class Card_V2_049_Tests assertEquals(CardType.POSSESSION, card.getBlueprint().getCardType()); assertTrue(card.getBlueprint().getPossessionClasses().contains(PossessionClass.HAND_WEAPON)); assertEquals(2, card.getBlueprint().getTwilightCost()); - assertEquals(+2, card.getBlueprint().getStrength()); + assertEquals(2, card.getBlueprint().getStrength()); } // 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_052_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_052_Tests.java index 7b675b09c..7cdf5437a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_052_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_052_Tests.java @@ -56,7 +56,7 @@ public class Card_V2_052_Tests assertEquals(Culture.ROHAN, card.getBlueprint().getCulture()); assertEquals(CardType.CONDITION, card.getBlueprint().getCardType()); assertEquals(1, card.getBlueprint().getTwilightCost()); - assertEquals(+2, card.getBlueprint().getStrength()); + assertEquals(2, card.getBlueprint().getStrength()); } // 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_071_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_071_Tests.java index 5e58254ab..119c87240 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_071_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_071_Tests.java @@ -56,7 +56,7 @@ public class Card_V2_071_Tests assertEquals(Culture.ELVEN, card.getBlueprint().getCulture()); assertEquals(CardType.CONDITION, card.getBlueprint().getCardType()); assertEquals(0, card.getBlueprint().getTwilightCost()); - assertEquals(+2, card.getBlueprint().getResistance()); + assertEquals(2, card.getBlueprint().getResistance()); } // Uncomment any @Test markers below once this is ready to be used