From 0c27211f1197661f3ba1b16666c0a11f284b40a9 Mon Sep 17 00:00:00 2001 From: theelk801 Date: Wed, 16 Oct 2024 11:10:50 -0400 Subject: [PATCH] more refactoring --- .../cards/continuous/FavorableWindsTest.java | 16 ++++---- .../cards/continuous/PaintersServantTest.java | 4 +- .../test/cards/continuous/WonderTest.java | 2 +- .../test/cards/copy/ArtisanOfFormsTest.java | 4 +- .../mage/test/cards/copy/CopySpellTest.java | 4 +- .../cards/copy/EssenceOfTheWildCopyTest.java | 2 +- .../test/cards/copy/EssenceOfTheWildTest.java | 2 +- .../cards/copy/KikiJikiMirrorBreakerTest.java | 2 +- .../mage/test/cards/copy/TokenCopyTest.java | 39 +++++++++---------- .../cost/additional/CollectEvidenceTest.java | 2 +- .../ModalDoubleFacedCardsTest.java | 4 +- .../modification/CostModificationTest.java | 2 +- .../mage/test/cards/dungeons/DungeonTest.java | 2 +- .../mage/test/cards/emblems/EmblemsTest.java | 2 +- .../test/cards/emblems/TheRingEmblemTest.java | 7 ++-- .../EnchantingGraveyardCardsTest.java | 9 ++--- .../cards/facedown/BaneAlleyBrokerTest.java | 2 +- .../test/cards/facedown/SummonersEggTest.java | 6 +-- .../redirect/PalisadeGiantTest.java | 2 +- .../single/brc/RootpathPurifierTest.java | 4 +- .../single/c13/MarathWillOfTheWildTest.java | 2 +- .../cards/single/fut/DustOfMomentsTest.java | 2 +- .../cards/single/inv/TravelersCloakTest.java | 4 +- .../single/ltr/WitchKingOfAngmarTest.java | 2 +- .../single/mh2/GristTheHungerTideTest.java | 4 +- .../single/mh3/ShiftingWoodlandTest.java | 2 +- .../test/cards/single/neo/StoryweaveTest.java | 4 +- .../test/cards/single/plc/ChronozoaTest.java | 4 +- .../cards/single/roe/CastThroughTimeTest.java | 2 +- .../slx/TadeasJuniperAscendantTest.java | 2 +- .../GodEternalDiesTriggeredAbilityTest.java | 4 +- .../triggers/ReturnToHandEffectsTest.java | 6 +-- .../test/mulligan/MulliganCardSorterTest.java | 4 +- .../test/serverside/PlayableEmblemsTest.java | 6 +-- .../mage/test/serverside/TokenImagesTest.java | 4 +- .../mage/test/serverside/TokenNamesTest.java | 6 +-- .../mage/test/sets/BoosterGenerationTest.java | 19 +++++---- .../org/mage/test/testapi/AddCardApiTest.java | 4 +- ...LibraryPutInHandOrOnBattlefieldEffect.java | 2 +- 39 files changed, 100 insertions(+), 100 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/FavorableWindsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/FavorableWindsTest.java index 5b2d45b3f7b..65737fac1b7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/FavorableWindsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/FavorableWindsTest.java @@ -33,12 +33,12 @@ public class FavorableWindsTest extends CardTestPlayerBase { int countSkySpirit = 0; int countMerfolkLooter = 0; for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(playerA.getId())) { - if (permanent.getName().equals("Sky Spirit")) { + if (permanent.hasName("Sky Spirit", currentGame)) { countSkySpirit++; // should get +1/+1, original is 2/2 Assert.assertEquals("Power is not the same", 3, permanent.getPower().getValue()); Assert.assertEquals("Toughness is not the same", 3, permanent.getToughness().getValue()); - } else if (permanent.getName().equals("Merfolk Looter")) { + } else if (permanent.hasName("Merfolk Looter", currentGame)) { countMerfolkLooter++; // should NOT get +1/+1, original is 1/1 Assert.assertEquals("Power is not the same", 1, permanent.getPower().getValue()); @@ -51,12 +51,12 @@ public class FavorableWindsTest extends CardTestPlayerBase { countSkySpirit = 0; countMerfolkLooter = 0; for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(playerB.getId())) { - if (permanent.getName().equals("Sky Spirit")) { + if (permanent.hasName("Sky Spirit", currentGame)) { countSkySpirit++; // should NOT +1/+1, original is 2/2 Assert.assertEquals("Power is not the same", 2, permanent.getPower().getValue()); Assert.assertEquals("Toughness is not the same", 2, permanent.getToughness().getValue()); - } else if (permanent.getName().equals("Merfolk Looter")) { + } else if (permanent.hasName("Merfolk Looter", currentGame)) { countMerfolkLooter++; // should NOT get +1/+1, original is 1/1 Assert.assertEquals("Power is not the same", 1, permanent.getPower().getValue()); @@ -88,12 +88,12 @@ public class FavorableWindsTest extends CardTestPlayerBase { int countSkySpirit = 0; int countMerfolkLooter = 0; for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(playerA.getId())) { - if (permanent.getName().equals("Sky Spirit")) { + if (permanent.hasName("Sky Spirit", currentGame)) { countSkySpirit++; // should get +1/+1, original is 2/2 Assert.assertEquals("Power is not the same", 5, permanent.getPower().getValue()); Assert.assertEquals("Toughness is not the same", 5, permanent.getToughness().getValue()); - } else if (permanent.getName().equals("Merfolk Looter")) { + } else if (permanent.hasName("Merfolk Looter", currentGame)) { countMerfolkLooter++; // should NOT get +1/+1, original is 1/1 Assert.assertEquals("Power is not the same", 1, permanent.getPower().getValue()); @@ -106,12 +106,12 @@ public class FavorableWindsTest extends CardTestPlayerBase { countSkySpirit = 0; countMerfolkLooter = 0; for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(playerB.getId())) { - if (permanent.getName().equals("Sky Spirit")) { + if (permanent.hasName("Sky Spirit", currentGame)) { countSkySpirit++; // should NOT +1/+1, original is 2/2 Assert.assertEquals("Power is not the same", 2, permanent.getPower().getValue()); Assert.assertEquals("Toughness is not the same", 2, permanent.getToughness().getValue()); - } else if (permanent.getName().equals("Merfolk Looter")) { + } else if (permanent.hasName("Merfolk Looter", currentGame)) { countMerfolkLooter++; // should NOT get +1/+1, original is 1/1 Assert.assertEquals("Power is not the same", 1, permanent.getPower().getValue()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PaintersServantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PaintersServantTest.java index 47d08354406..21760508870 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PaintersServantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PaintersServantTest.java @@ -127,13 +127,13 @@ public class PaintersServantTest extends CardTestPlayerBase { Assert.assertEquals(false, card.getColor(currentGame).isBlue()); } for (Card card : playerA.getGraveyard().getCards(currentGame)) { - if (card.getName().equals("Silvercoat Lion")) { + if (card.hasName("Silvercoat Lion", currentGame)) { Assert.assertEquals(true, card.getColor(currentGame).isWhite()); Assert.assertEquals(false, card.getColor(currentGame).isBlue()); } } for (Card card : playerB.getGraveyard().getCards(currentGame)) { - if (card.getName().equals("Silvercoat Lion")) { + if (card.hasName("Silvercoat Lion", currentGame)) { Assert.assertEquals(true, card.getColor(currentGame).isWhite()); Assert.assertEquals(false, card.getColor(currentGame).isBlue()); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WonderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WonderTest.java index d4c13331a88..098be73080e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WonderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WonderTest.java @@ -39,7 +39,7 @@ public class WonderTest extends CardTestPlayerBase { // check no flying in graveyard for (Card card : playerA.getGraveyard().getCards(currentGame)) { - if (card.getName().equals("Runeclaw Bear")) { + if (card.hasName("Runeclaw Bear", currentGame)) { Assert.assertFalse(card.hasAbility(FlyingAbility.getInstance(), currentGame)); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java index 732a51e019c..9f4de7eae7d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java @@ -46,7 +46,7 @@ public class ArtisanOfFormsTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Silvercoat Lion", 2); for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(playerA.getId())) { - if (permanent.getName().equals("Silvercoat Lion")) { + if (permanent.hasName("Silvercoat Lion", currentGame)) { Assert.assertEquals("Creature has to have Cast + Heroic ability", 2, permanent.getAbilities().size()); } } @@ -90,7 +90,7 @@ public class ArtisanOfFormsTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Silvercoat Lion", 3); for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(playerA.getId())) { - if (permanent.getName().equals("Silvercoat Lion")) { + if (permanent.hasName("Silvercoat Lion", currentGame)) { Assert.assertEquals("Creature has to have Cast + Heroic ability", 2, permanent.getAbilities().size()); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java index 4c01474b53c..81746bdabed 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java @@ -634,12 +634,12 @@ public class CopySpellTest extends CardTestPlayerBase { // counters checks, have to check if it's a card or a token since token copies have isCopy()=false int originalCounters = currentGame.getBattlefield().getAllActivePermanents().stream() - .filter(p -> p.getName().equals("Grenzo, Dungeon Warden")) + .filter(p -> p.hasName("Grenzo, Dungeon Warden", currentGame)) .filter(p -> p instanceof PermanentCard) .mapToInt(p -> p.getCounters(currentGame).getCount(CounterType.P1P1)) .sum(); int copyCounters = currentGame.getBattlefield().getAllActivePermanents().stream() - .filter(p -> p.getName().equals("Grenzo, Dungeon Warden")) + .filter(p -> p.hasName("Grenzo, Dungeon Warden", currentGame)) .filter(p -> p instanceof PermanentToken) .mapToInt(p -> p.getCounters(currentGame).getCount(CounterType.P1P1)) .sum(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java index 99153737977..6b47af39e4e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java @@ -38,7 +38,7 @@ public class EssenceOfTheWildCopyTest extends CardTestPlayerBase { private Permanent findOriginPermanent(Game game, String permName) { for (Permanent perm : game.getBattlefield().getAllActivePermanents()) { - if (!perm.isCopy() && perm.getName().equals(permName)) { + if (!perm.isCopy() && perm.hasName(permName, currentGame)) { return perm; } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildTest.java index 2d399fd4bde..f3f93e24310 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildTest.java @@ -33,7 +33,7 @@ public class EssenceOfTheWildTest extends CardTestPlayerBase { private Permanent findOriginPermanent(Game game, String permName) { for (Permanent perm : game.getBattlefield().getAllActivePermanents()) { - if (!perm.isCopy() && perm.getName().equals(permName)) { + if (!perm.isCopy() && perm.hasName(permName, currentGame)) { return perm; } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java index 08b4dccde0f..37a40c6f7e5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java @@ -148,7 +148,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { Permanent kikiCopy = null; for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, currentGame)) { - if (permanent.getName().equals("Silvercoat Lion") && (permanent instanceof PermanentToken)) { + if (permanent.hasName("Silvercoat Lion", currentGame) && (permanent instanceof PermanentToken)) { kikiCopy = permanent; break; } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/TokenCopyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/TokenCopyTest.java index 43f7d59e50c..57478a790f4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/TokenCopyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/TokenCopyTest.java @@ -23,27 +23,24 @@ public class TokenCopyTest extends CardTestPlayerBase { assertPermanentCount(playerA, prowler, prowlerCount); assertPermanentCount(playerA, predator, predatorCount); for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents()) { - switch (permanent.getName()) { - case prowler: - Assert.assertEquals("Power of " + prowler + " should be 2", 2, permanent.getPower().getValue()); - Assert.assertEquals("Toughness of " + prowler + " should be 1", 1, permanent.getToughness().getValue()); - Assert.assertEquals(prowler + " should be green", ObjectColor.GREEN, permanent.getColor(currentGame)); - Assert.assertTrue(prowler + " should be a Werewolf", permanent.hasSubtype(SubType.WEREWOLF, currentGame)); - Assert.assertTrue(prowler + " should be a Horror", permanent.hasSubtype(SubType.HORROR, currentGame)); - Assert.assertFalse(prowler + " should not be an Eldrazi", permanent.hasSubtype(SubType.ELDRAZI, currentGame)); - Assert.assertEquals(prowler + " should have mana value 1", 1, permanent.getManaValue()); - Assert.assertFalse(prowler + " should not be transformed", permanent.isTransformed()); - break; - case predator: - Assert.assertEquals("Power of " + predator + " should be 4", 4, permanent.getPower().getValue()); - Assert.assertEquals("Toughness of " + predator + " should be 4", 4, permanent.getToughness().getValue()); - Assert.assertTrue(predator + " should be colorless", permanent.getColor(currentGame).isColorless()); - Assert.assertTrue(predator + " should be an Eldrazi", permanent.hasSubtype(SubType.ELDRAZI, currentGame)); - Assert.assertTrue(predator + " should be a Werewolf", permanent.hasSubtype(SubType.WEREWOLF, currentGame)); - Assert.assertFalse(predator + " should not be a Horror", permanent.hasSubtype(SubType.HORROR, currentGame)); - Assert.assertEquals(predator + " should have mana value 1", 1, permanent.getManaValue()); - Assert.assertTrue(prowler + " should be transformed", permanent.isTransformed()); - break; + if (permanent.hasName(prowler, currentGame)) { + Assert.assertEquals("Power of " + prowler + " should be 2", 2, permanent.getPower().getValue()); + Assert.assertEquals("Toughness of " + prowler + " should be 1", 1, permanent.getToughness().getValue()); + Assert.assertEquals(prowler + " should be green", ObjectColor.GREEN, permanent.getColor(currentGame)); + Assert.assertTrue(prowler + " should be a Werewolf", permanent.hasSubtype(SubType.WEREWOLF, currentGame)); + Assert.assertTrue(prowler + " should be a Horror", permanent.hasSubtype(SubType.HORROR, currentGame)); + Assert.assertFalse(prowler + " should not be an Eldrazi", permanent.hasSubtype(SubType.ELDRAZI, currentGame)); + Assert.assertEquals(prowler + " should have mana value 1", 1, permanent.getManaValue()); + Assert.assertFalse(prowler + " should not be transformed", permanent.isTransformed()); + } else if (permanent.hasName(predator, currentGame)) { + Assert.assertEquals("Power of " + predator + " should be 4", 4, permanent.getPower().getValue()); + Assert.assertEquals("Toughness of " + predator + " should be 4", 4, permanent.getToughness().getValue()); + Assert.assertTrue(predator + " should be colorless", permanent.getColor(currentGame).isColorless()); + Assert.assertTrue(predator + " should be an Eldrazi", permanent.hasSubtype(SubType.ELDRAZI, currentGame)); + Assert.assertTrue(predator + " should be a Werewolf", permanent.hasSubtype(SubType.WEREWOLF, currentGame)); + Assert.assertFalse(predator + " should not be a Horror", permanent.hasSubtype(SubType.HORROR, currentGame)); + Assert.assertEquals(predator + " should have mana value 1", 1, permanent.getManaValue()); + Assert.assertTrue(prowler + " should be transformed", permanent.isTransformed()); } } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/CollectEvidenceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/CollectEvidenceTest.java index 2e608ce4130..84b554fe1b2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/CollectEvidenceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/CollectEvidenceTest.java @@ -334,7 +334,7 @@ public class CollectEvidenceTest extends CardTestPlayerBase { // before runCode("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, (info, player, game) -> { - Card card = playerA.getHand().getCards(game).stream().filter(c -> c.getName().equals(bite)).findFirst().orElse(null); + Card card = playerA.getHand().getCards(game).stream().filter(c -> c.hasName(bite, currentGame)).findFirst().orElse(null); Assert.assertNotNull(card); Ability ability = card.getAbilities(game).stream().filter(a -> a instanceof CollectEvidenceAbility).findFirst().orElse(null); Assert.assertNotNull(ability); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java index 7fd088c4ec0..3cde69d2f4f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java @@ -1051,7 +1051,7 @@ public class ModalDoubleFacedCardsTest extends CardTestPlayerBase { runCode("check side 2", 1, PhaseStep.PRECOMBAT_MAIN, playerA, (info, player, game) -> { PermanentToken permanent = (PermanentToken) game.getBattlefield().getAllPermanents() .stream() - .filter(p -> p.getName().equals("Tergrid, God of Fright")) + .filter(p -> p.hasName("Tergrid, God of Fright", currentGame)) .findFirst() .orElse(null); Assert.assertNotNull(permanent); @@ -1080,7 +1080,7 @@ public class ModalDoubleFacedCardsTest extends CardTestPlayerBase { GameView gameView = getGameView(playerA); PermanentView permanentView = gameView.getMyPlayer().getBattlefield().values() .stream() - .filter(p -> p.getName().equals("Tergrid, God of Fright")) + .filter(p -> p.hasName("Tergrid, God of Fright", currentGame)) .findFirst() .orElse(null); Assert.assertNotNull(permanentView); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java index 1f0e6467275..36799049cf6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java @@ -427,7 +427,7 @@ public class CostModificationTest extends CardTestPlayerBase { // Huatli: check x cost changes runCode("check x cost", 3, PhaseStep.PRECOMBAT_MAIN, playerA, (info, player, game) -> { - Permanent huatli = game.getBattlefield().getAllActivePermanents().stream().filter(p -> p.getName().equals("Huatli, Warrior Poet")).findFirst().orElse(null); + Permanent huatli = game.getBattlefield().getAllActivePermanents().stream().filter(p -> p.hasName("Huatli, Warrior Poet", currentGame)).findFirst().orElse(null); Assert.assertNotNull("must have huatli on battlefield", huatli); LoyaltyAbility ability = (LoyaltyAbility) huatli.getAbilities(game).stream().filter(a -> a.getRule().startsWith("-X: ")).findFirst().orElse(null); Assert.assertNotNull("must have loyalty ability", ability); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java index 548ecea0a7c..3ecbf5a18b8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java @@ -69,7 +69,7 @@ public class DungeonTest extends CardTestPlayerBase { return; } Assert.assertNotNull("Dungeon should not be null", dungeon); - Assert.assertEquals("Dungeon should be " + dungeonName, dungeonName, dungeon.getName()); + Assert.assertTrue("Dungeon should be " + dungeonName, dungeon.hasName(dungeonName, currentGame)); Assert.assertEquals( "Current room is " + roomName, roomName, dungeon.getCurrentRoom().getName() diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/emblems/EmblemsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/emblems/EmblemsTest.java index a1587ff240e..5542c0764ec 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/emblems/EmblemsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/emblems/EmblemsTest.java @@ -116,7 +116,7 @@ public class EmblemsTest extends CardTestPlayerBase { boolean found = false; for (Card card : playerA.getHand().getCards(currentGame)) { - if (card.getName().equals("Elite Vanguard")) { + if (card.hasName("Elite Vanguard", currentGame)) { found = true; } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/emblems/TheRingEmblemTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/emblems/TheRingEmblemTest.java index 4c4afe0424e..08625a73aff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/emblems/TheRingEmblemTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/emblems/TheRingEmblemTest.java @@ -1,6 +1,5 @@ package org.mage.test.cards.emblems; -import mage.MageObject; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.command.emblems.TheRingEmblem; @@ -33,15 +32,15 @@ public class TheRingEmblemTest extends CardTestPlayerBase { boolean hasEmblem = ringEmblems.stream().anyMatch(e -> e.isControlledBy(player.getId())); Assert.assertEquals(info + " - ring emblem for " + player.getName(), needEmblem, hasEmblem); - String hasBearer = Optional.ofNullable(player.getRingBearer(currentGame)).map(MageObject::getName).orElse(null); - Assert.assertEquals(info + " - ring bearer for " + player.getName(), needBearer, hasBearer); + boolean hasBearer = Optional.ofNullable(player.getRingBearer(currentGame)).map(permanent -> permanent.hasName(needBearer, currentGame)).orElse(false); + Assert.assertTrue(info + " - ring bearer for " + player.getName(), hasBearer); } private void assertPermanent(String info, Player player, String needName, boolean needLegendary) { Permanent permanent = currentGame.getBattlefield().getAllActivePermanents(player.getId()) .stream() .filter(p -> p.isControlledBy(player.getId())) - .filter(p -> p.getName().equals(needName)) + .filter(p -> p.hasName(needName, currentGame)) .findFirst() .orElse(null); Assert.assertNotNull(info + " - permanent " + needName + " for player " + player.getName() + " must exist", permanent); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/EnchantingGraveyardCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/EnchantingGraveyardCardsTest.java index f4d4c757fd4..891ac27ed50 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/EnchantingGraveyardCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/EnchantingGraveyardCardsTest.java @@ -11,7 +11,6 @@ import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** - * * @author LevelX2 */ public class EnchantingGraveyardCardsTest extends CardTestPlayerBase { @@ -50,7 +49,7 @@ public class EnchantingGraveyardCardsTest extends CardTestPlayerBase { if (spellweaver != null) { attachedToCard = playerB.getGraveyard().get(spellweaver.getAttachedTo(), currentGame); } - Assert.assertTrue(SPELLWEAVER_VOLUTE + " has to be attached to Lightning Bolt in graveyard", attachedToCard != null && attachedToCard.getName().equals(LIGHTNING_BOLT)); + Assert.assertTrue(SPELLWEAVER_VOLUTE + " has to be attached to Lightning Bolt in graveyard", attachedToCard != null && attachedToCard.hasName(LIGHTNING_BOLT, currentGame)); } /** @@ -94,7 +93,7 @@ public class EnchantingGraveyardCardsTest extends CardTestPlayerBase { if (spellweaver != null) { attachedToCard = playerA.getGraveyard().get(spellweaver.getAttachedTo(), currentGame); } - Assert.assertTrue(SPELLWEAVER_VOLUTE + " has to be attached to Aerial Volley in graveyard", attachedToCard != null && attachedToCard.getName().equals("Aerial Volley")); + Assert.assertTrue(SPELLWEAVER_VOLUTE + " has to be attached to Aerial Volley in graveyard", attachedToCard != null && attachedToCard.hasName("Aerial Volley", currentGame)); assertHandCount(playerA, 1); @@ -139,7 +138,7 @@ public class EnchantingGraveyardCardsTest extends CardTestPlayerBase { assertGraveyardCount(playerA, SPELLWEAVER_VOLUTE, 1); for (Card card : currentGame.getExile().getAllCards(currentGame)) { - if (card.getName().equals(LIGHTNING_BOLT)) { + if (card.hasName(LIGHTNING_BOLT, currentGame)) { Assert.assertTrue(LIGHTNING_BOLT + " may not have any attachments", card.getAttachments().isEmpty()); } @@ -183,7 +182,7 @@ public class EnchantingGraveyardCardsTest extends CardTestPlayerBase { assertPermanentCount(playerA, SPELLWEAVER_VOLUTE, 0); for (Card card : playerB.getGraveyard().getCards(currentGame)) { - if (card.getName().equals(LIGHTNING_BOLT)) { + if (card.hasName(LIGHTNING_BOLT, currentGame)) { Assert.assertTrue(LIGHTNING_BOLT + " may not have any attachments", card.getAttachments().isEmpty()); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/BaneAlleyBrokerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/BaneAlleyBrokerTest.java index ed412914670..9d37121c5f5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/BaneAlleyBrokerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/BaneAlleyBrokerTest.java @@ -41,7 +41,7 @@ public class BaneAlleyBrokerTest extends CardTestPlayerBase { assertExileCount("Goblin Roughrider", 1); for (Card card : currentGame.getExile().getAllCards(currentGame)) { - if (card.getName().equals("Goblin Roughrider")) { + if (card.hasName("Goblin Roughrider", currentGame)) { Assert.assertTrue("Exiled card is not face down", card.isFaceDown(currentGame)); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/SummonersEggTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/SummonersEggTest.java index c8796b10770..73b23a6144a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/SummonersEggTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/SummonersEggTest.java @@ -44,7 +44,7 @@ public class SummonersEggTest extends CardTestPlayerBase { assertExileCount("Goblin Roughrider", 1); for (Card card : currentGame.getExile().getAllCards(currentGame)) { - if (card.getName().equals("Goblin Roughrider")) { + if (card.hasName("Goblin Roughrider", currentGame)) { Assert.assertTrue("Exiled card is not face down", card.isFaceDown(currentGame)); } } @@ -80,7 +80,7 @@ public class SummonersEggTest extends CardTestPlayerBase { assertExileCount("Goblin Roughrider", 0); assertPermanentCount(playerA, "Goblin Roughrider", 1); for (Permanent p : currentGame.getBattlefield().getAllActivePermanents()) { - if (p.getName().equals("Goblin Roughrider")) { + if (p.hasName("Goblin Roughrider", currentGame)) { Assert.assertTrue("Permanent is not face up", !p.isFaceDown(currentGame)); } } @@ -113,7 +113,7 @@ public class SummonersEggTest extends CardTestPlayerBase { assertExileCount("Forest", 1); for (Card card : currentGame.getExile().getAllCards(currentGame)) { - if (card.getName().equals("Forest")) { + if (card.hasName("Forest", currentGame)) { Assert.assertTrue("Exiled card is not face up", !card.isFaceDown(currentGame)); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/redirect/PalisadeGiantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/redirect/PalisadeGiantTest.java index d2823328918..4d7fe0e7849 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/redirect/PalisadeGiantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/redirect/PalisadeGiantTest.java @@ -43,7 +43,7 @@ public class PalisadeGiantTest extends CardTestPlayerBase { int damage = 0; for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(playerA.getId())) { - if (permanent.getName().equals("Palisade Giant")) { + if (permanent.hasName("Palisade Giant", currentGame)) { damage += permanent.getDamage(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/brc/RootpathPurifierTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/brc/RootpathPurifierTest.java index 867e1261a1a..e33147e21a7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/brc/RootpathPurifierTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/brc/RootpathPurifierTest.java @@ -90,7 +90,7 @@ public class RootpathPurifierTest extends CardTestPlayerBase { playerA.getHand() .getCards(currentGame) .stream() - .filter(card -> tree.equals(card.getName())) + .filter(card -> card.hasName(tree, currentGame)) .noneMatch(card -> card.isBasic(currentGame)) ); } @@ -116,7 +116,7 @@ public class RootpathPurifierTest extends CardTestPlayerBase { playerA.getLibrary() .getCards(currentGame) .stream() - .filter(card -> tree.equals(card.getName())) + .filter(card -> card.hasName(tree, currentGame)) .noneMatch(card -> card.isBasic(currentGame)) ); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java index 111cc78e3ef..6b58cbc6288 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java @@ -39,7 +39,7 @@ public class MarathWillOfTheWildTest extends CardTestCommanderDuelBase { ManaPaidSourceWatcher watcher = game.getState().getWatcher(ManaPaidSourceWatcher.class); Permanent perm = game.getBattlefield().getAllPermanents() .stream() - .filter(p -> p.getName().equals("Marath, Will of the Wild")) + .filter(p -> p.hasName("Marath, Will of the Wild", currentGame)) .findFirst() .orElse(null); Assert.assertNotNull(perm); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/DustOfMomentsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/DustOfMomentsTest.java index 4f6a84ec631..37c2348dded 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/DustOfMomentsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/DustOfMomentsTest.java @@ -29,7 +29,7 @@ public class DustOfMomentsTest extends CardTestPlayerBase { Assert.assertEquals(2, activeCreatures.size()); for (final Permanent creature : activeCreatures) { - Assert.assertEquals("Chronozoa", creature.getName()); + Assert.assertTrue(creature.hasName("Chronozoa", currentGame)); Assert.assertEquals(3, creature.getCounters(currentGame).getCount(CounterType.TIME)); } // Check time counters on kraken diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/TravelersCloakTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/TravelersCloakTest.java index 4e5c7168f2a..2d4d4497a90 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/TravelersCloakTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/TravelersCloakTest.java @@ -39,7 +39,7 @@ public class TravelersCloakTest extends CardTestPlayerBase { runCode("check blocking", 1, PhaseStep.DECLARE_BLOCKERS, playerB, (info, player, game) -> { Permanent blocker = game.getBattlefield().getAllActivePermanents() .stream() - .filter(p -> p.getName().equals("Kitesail Corsair")) + .filter(p -> p.hasName("Kitesail Corsair", currentGame)) .findFirst() .get(); Assert.assertFalse("Grizzly Bears must be protected from blocking by Kitesail Corsair", @@ -50,4 +50,4 @@ public class TravelersCloakTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); } -} \ No newline at end of file +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ltr/WitchKingOfAngmarTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ltr/WitchKingOfAngmarTest.java index 46930ca643c..5c703a68a13 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ltr/WitchKingOfAngmarTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ltr/WitchKingOfAngmarTest.java @@ -35,7 +35,7 @@ public class WitchKingOfAngmarTest extends CardTestPlayerBase { runCode("check ring bear", 2, PhaseStep.POSTCOMBAT_MAIN, playerA, (info, player, game) -> { Assert.assertNotNull(playerA.getRingBearer(game)); - Assert.assertEquals(witchKing, playerA.getRingBearer(game).getName()); + Assert.assertTrue(playerA.getRingBearer(game).hasName(witchKing, currentGame)); Assert.assertNull(playerB.getRingBearer(game)); }); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java index 6ccb9cd0c98..1fdbf924561 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java @@ -30,7 +30,7 @@ public class GristTheHungerTideTest extends CardTestPlayerBase { execute(); for (Card card : currentGame.getCards()) { - if (!card.getName().equals(grist)) { + if (!card.hasName(grist, currentGame)) { continue; } Zone zone = currentGame.getState().getZone(card.getId()); @@ -56,7 +56,7 @@ public class GristTheHungerTideTest extends CardTestPlayerBase { execute(); for (Card card : currentGame.getCards()) { - if (!card.getName().equals(grist)) { + if (!card.hasName(grist, currentGame)) { continue; } Assert.assertEquals("", Zone.EXILED, currentGame.getState().getZone(card.getId())); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/ShiftingWoodlandTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/ShiftingWoodlandTest.java index 90b80d04a13..d9478cce93b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/ShiftingWoodlandTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/ShiftingWoodlandTest.java @@ -91,7 +91,7 @@ public class ShiftingWoodlandTest extends CardTestPlayerBase { castSpell(1, PhaseStep.END_COMBAT, playerA, "Shoot the Sheriff", "Grizzly Bears", true); runCode("check that the copy effect ended", 1, PhaseStep.END_COMBAT, playerA, (info, player, game) -> { - Card card = player.getGraveyard().getCards(game).stream().filter(c -> c.getName().equals(woodland)).findFirst().orElse(null); + Card card = player.getGraveyard().getCards(game).stream().filter(c -> c.hasName(woodland, currentGame)).findFirst().orElse(null); if (card == null) { Assert.fail("Shifting Woodland is not in the graveyard"); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java index 945d6ecec96..106e001e5c1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java @@ -67,7 +67,7 @@ public class StoryweaveTest extends CardTestPlayerBase { .getBattlefield() .getAllActivePermanents() .stream() - .filter(permanent -> "Centaur Token".equals(permanent.getName())) + .filter(permanent -> permanent.hasName("Centaur Token", currentGame)) .noneMatch(permanent -> permanent.getCounters(currentGame).getCount(CounterType.P1P1) != 2)); } @@ -97,7 +97,7 @@ public class StoryweaveTest extends CardTestPlayerBase { .getBattlefield() .getAllActivePermanents() .stream() - .filter(permanent -> "Centaur Token".equals(permanent.getName())) + .filter(permanent -> permanent.hasName("Centaur Token", currentGame)) .noneMatch(permanent -> permanent.getCounters(currentGame).getCount(CounterType.P1P1) != 0)); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/plc/ChronozoaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/plc/ChronozoaTest.java index e8cce2d1a31..408c9d357b1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/plc/ChronozoaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/plc/ChronozoaTest.java @@ -61,8 +61,8 @@ public class ChronozoaTest extends CardTestPlayerBase { for (final Permanent creature : creatures) { // Make sure the creatures are Chronozoa tokens - Assert.assertEquals("Chronozoa", creature.getName()); - Assert.assertEquals("Chronozoa has to be a token", true, creature instanceof PermanentToken); + Assert.assertTrue(creature.hasName("Chronozoa", currentGame)); + Assert.assertTrue("Chronozoa has to be a token", creature instanceof PermanentToken); // Make sure each token has 2 time counters final Counters counters = creature.getCounters(currentGame); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/CastThroughTimeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/CastThroughTimeTest.java index fd8e1bc84a1..98a10b196e8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/CastThroughTimeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/roe/CastThroughTimeTest.java @@ -67,7 +67,7 @@ public class CastThroughTimeTest extends CardTestPlayerBase { boolean found = false; for (Card card : currentGame.getPlayer(playerA.getId()).getHand().getCards(currentGame)) { - if (card.getName().equals("Lightning Bolt")) { + if (card.hasName("Lightning Bolt", currentGame)) { for (String rule : card.getRules(currentGame)) { if (rule.startsWith("Rebound")) { found = true; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/slx/TadeasJuniperAscendantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/slx/TadeasJuniperAscendantTest.java index b381eb297bb..47c1584b3de 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/slx/TadeasJuniperAscendantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/slx/TadeasJuniperAscendantTest.java @@ -29,7 +29,7 @@ public class TadeasJuniperAscendantTest extends CardTestPlayerBase { private Permanent getBlocker(String blocker, mage.game.Game game) { return game.getBattlefield().getAllActivePermanents() .stream() - .filter(p -> p.getName().equals(blocker)) + .filter(p -> p.hasName(blocker, currentGame)) .findFirst() .get(); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GodEternalDiesTriggeredAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GodEternalDiesTriggeredAbilityTest.java index 307bfced15d..3e7afb133ce 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GodEternalDiesTriggeredAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GodEternalDiesTriggeredAbilityTest.java @@ -33,7 +33,7 @@ public class GodEternalDiesTriggeredAbilityTest extends CardTestPlayerBase { assertPermanentCount(playerA, godEternalBontu, 0); assertGraveyardCount(playerA, godEternalBontu, 0); Card card = currentGame.getCard(playerA.getLibrary().getCardList().get(2)); - Assert.assertEquals(card.getName(), godEternalBontu); + Assert.assertTrue(card.hasName(godEternalBontu, currentGame)); } /** @@ -54,7 +54,7 @@ public class GodEternalDiesTriggeredAbilityTest extends CardTestPlayerBase { assertPermanentCount(playerA, godEternalBontu, 0); assertExileCount(playerA, godEternalBontu, 0); Card card = currentGame.getCard(playerA.getLibrary().getCardList().get(2)); - Assert.assertEquals(card.getName(), godEternalBontu); + Assert.assertTrue(card.hasName(godEternalBontu, currentGame)); } /** diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java index 2fc31b9d548..ca173dec626 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java @@ -97,7 +97,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { .getAllActivePermanents() .stream() .filter(Objects::nonNull) - .filter(p -> p.getName().equals(cardName)) + .filter(p -> p.hasName(cardName, currentGame)) .findFirst(); if (!optPermanent.isPresent()) { Assert.fail(info + " — no permanent named \"" + cardName + "\" found on battlefield"); @@ -133,7 +133,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { .getCards(game) .stream() .filter(Objects::nonNull) - .filter(p -> p.getName().equals(cardName)) + .filter(p -> p.hasName(cardName, currentGame)) .findFirst(); if (!optCard.isPresent()) { Assert.fail(info + " — no card named \"" + cardName + "\" found in graveyard"); @@ -152,7 +152,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { .getCards(game) .stream() .filter(Objects::nonNull) - .filter(p -> p.getName().equals(cardName)) + .filter(p -> p.hasName(cardName, currentGame)) .findFirst(); if (!optCard.isPresent()) { Assert.fail(info + " — no card named \"" + cardName + "\" found in hand"); diff --git a/Mage.Tests/src/test/java/org/mage/test/mulligan/MulliganCardSorterTest.java b/Mage.Tests/src/test/java/org/mage/test/mulligan/MulliganCardSorterTest.java index 1e5e563f6df..61bbab20d9b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/mulligan/MulliganCardSorterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/mulligan/MulliganCardSorterTest.java @@ -29,7 +29,7 @@ public class MulliganCardSorterTest extends CardTestPlayerBase { .stream() .map(name -> currentGame.getCards() .stream() - .filter(c -> c.getName().equals(name)) + .filter(c -> c.hasName(name, currentGame)) .findFirst() .orElseThrow(() -> new IllegalStateException("Can't find testing card " + name)) ) @@ -110,4 +110,4 @@ public class MulliganCardSorterTest extends CardTestPlayerBase { )); } -} \ No newline at end of file +} diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayableEmblemsTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayableEmblemsTest.java index d5f411689e5..33999b5266d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayableEmblemsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayableEmblemsTest.java @@ -54,7 +54,7 @@ public class PlayableEmblemsTest extends CardTestCommander4Players { // playable commander UUID needObjectId = game.getCommandersIds(playerA, CommanderCardType.COMMANDER_OR_OATHBREAKER, false) .stream() - .filter(id -> game.getObject(id).getName().equals("Balduvian Bears")) + .filter(id -> game.getObject(id).hasName("Balduvian Bears", currentGame)) .findFirst() .orElse(null); Assert.assertNotNull(needObjectId); @@ -63,7 +63,7 @@ public class PlayableEmblemsTest extends CardTestCommander4Players { // non playable commander needObjectId = game.getCommandersIds(playerA, CommanderCardType.COMMANDER_OR_OATHBREAKER, false) .stream() - .filter(id -> game.getObject(id).getName().equals("Goblin Arsonist")) + .filter(id -> game.getObject(id).hasName("Goblin Arsonist", currentGame)) .findFirst() .orElse(null); Assert.assertNotNull(needObjectId); @@ -74,7 +74,7 @@ public class PlayableEmblemsTest extends CardTestCommander4Players { .stream() .filter(obj -> obj instanceof Emblem) .filter(obj -> obj.isControlledBy(playerA.getId())) - .filter(obj -> obj.getName().equals("Emblem Momir")) + .filter(obj -> obj.hasName("Emblem Momir", currentGame)) .map(MageItem::getId) .findFirst() .orElse(null); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/TokenImagesTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/TokenImagesTest.java index 8f645ad543f..5b3a0de8a03 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/TokenImagesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/TokenImagesTest.java @@ -150,7 +150,7 @@ public class TokenImagesTest extends CardTestPlayerBase { Map> realServerStats = new LinkedHashMap<>(); currentGame.getBattlefield().getAllPermanents() .stream() - .filter(card -> card.getName().equals(tokenName)) + .filter(card -> card.hasName(tokenName, currentGame)) .filter(card -> card instanceof PermanentToken) .sorted(Comparator.comparing(Card::getExpansionSetCode)) .forEach(card -> { @@ -267,7 +267,7 @@ public class TokenImagesTest extends CardTestPlayerBase { private void assert_TokenOrCardImageNumber(String tokenOrCardName, List needUniqueImages) { Set serverStats = currentGame.getBattlefield().getAllPermanents() .stream() - .filter(card -> card.getName().equals(tokenOrCardName)) + .filter(card -> card.hasName(tokenOrCardName, currentGame)) .filter(card -> card instanceof MageObjectImpl) .sorted(Comparator.comparing(Card::getExpansionSetCode)) .map(card -> (MageObjectImpl) card) diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/TokenNamesTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/TokenNamesTest.java index 6da7a7ebdea..ae0bb9f653a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/TokenNamesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/TokenNamesTest.java @@ -88,8 +88,8 @@ public class TokenNamesTest extends CardTestPlayerBase { @Test public void test_Rules_111_4_AutoGeneratedName() { - Assert.assertEquals("Human Cleric Token", new CreatureToken(2, 2, "", SubType.HUMAN, SubType.CLERIC).getName()); - Assert.assertEquals("Warrior Token", new CreatureToken(2, 2, "", SubType.WARRIOR).getName()); - Assert.assertEquals("Custom Name", new CreatureToken(2, 2, "", SubType.WARRIOR).withName("Custom Name").getName()); + Assert.assertTrue(new CreatureToken(2, 2, "", SubType.HUMAN, SubType.CLERIC).hasName("Human Cleric Token", currentGame)); + Assert.assertTrue(new CreatureToken(2, 2, "", SubType.WARRIOR).hasName("Warrior Token", currentGame)); + Assert.assertTrue(new CreatureToken(2, 2, "", SubType.WARRIOR).withName("Custom Name").hasName("Custom Name", currentGame)); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java index 7e9cd397b47..aac0ffbd2dc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java @@ -14,7 +14,6 @@ import mage.game.draft.ReshuffledSet; import mage.sets.*; import mage.util.CardUtil; import org.junit.Assert; -import static org.junit.Assert.*; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -23,6 +22,12 @@ import org.mage.test.serverside.base.MageTestPlayerBase; import java.util.*; import java.util.stream.Collectors; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author nigelzor, JayDi85 */ @@ -50,7 +55,7 @@ public class BoosterGenerationTest extends MageTestPlayerBase { private static boolean contains(List cards, String name, String code) { return cards.stream().anyMatch((card) - -> (card.getName().equals(name) + -> (card.hasName(name, currentGame) && (code == null || card.getExpansionSetCode().equals(code))) ); } @@ -331,22 +336,22 @@ public class BoosterGenerationTest extends MageTestPlayerBase { case 2: assertEquals( "Booster can't have two snow lands unless one is Shimmerdrift Vale or Faceless Haven", 1, - snowLands.stream().filter(card -> card.getName().equals("Shimmerdrift Vale") || card.getName().equals("Faceless Haven")).count() + snowLands.stream().filter(card -> card.hasName("Shimmerdrift Vale", currentGame) || card.hasName("Faceless Haven", currentGame)).count() ); assertEquals( "Booster can't have two snow lands unless one is not Shimmerdrift Vale or Faceless Haven", 1, - snowLands.stream().filter(card -> !card.getName().equals("Shimmerdrift Vale") && !card.getName().equals("Faceless Haven")).count() + snowLands.stream().filter(card -> !card.hasName("Shimmerdrift Vale", currentGame) && !card.hasName("Faceless Haven", currentGame)).count() ); break; case 3: assertEquals("Booster can't have three snow lands unless one is Shimmerdrift Vale", 1, - snowLands.stream().filter(card -> card.getName().equals("Shimmerdrift Vale")).count() + snowLands.stream().filter(card -> card.hasName("Shimmerdrift Vale", currentGame)).count() ); assertEquals("Booster can't have three snow lands unless one is Faceless Haven", 1, - snowLands.stream().filter(card -> card.getName().equals("Faceless Haven")).count() + snowLands.stream().filter(card -> card.hasName("Faceless Haven", currentGame)).count() ); assertEquals("Booster can't have three snow lands unless one is not Shimmerdrift Vale or Faceless Haven", 1, - snowLands.stream().filter(card -> !card.getName().equals("Shimmerdrift Vale") && !card.getName().equals("Faceless Haven")).count() + snowLands.stream().filter(card -> !card.hasName("Shimmerdrift Vale", currentGame) && !card.hasName("Faceless Haven", currentGame)).count() ); break; default: diff --git a/Mage.Tests/src/test/java/org/mage/test/testapi/AddCardApiTest.java b/Mage.Tests/src/test/java/org/mage/test/testapi/AddCardApiTest.java index e04ad0bf39b..886ccab70b3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/testapi/AddCardApiTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/testapi/AddCardApiTest.java @@ -91,13 +91,13 @@ public class AddCardApiTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Memorial to Glory", 2); getBattlefieldCards(playerA) .stream() - .filter(info -> info.getCard().getName().equals("Memorial to Glory")) + .filter(info -> info.getCard().hasName("Memorial to Glory", currentGame)) .forEach(info -> Assert.assertEquals("40K", info.getCard().getExpansionSetCode())); assertPermanentCount(playerA, "Plains", 2); getBattlefieldCards(playerA) .stream() - .filter(info -> info.getCard().getName().equals("Plains")) + .filter(info -> info.getCard().hasName("Plains", currentGame)) .forEach(info -> Assert.assertEquals("PANA", info.getCard().getExpansionSetCode())); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java index 8f7a28686c8..0ebfc4b89e5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java @@ -56,7 +56,7 @@ public class SearchLibraryPutInHandOrOnBattlefieldEffect extends SearchEffect { for (UUID cardId : target.getTargets()) { Card card = game.getCard(cardId); if (card != null) { - if (card.getName().equals(nameToPutOnBattlefield)) { + if (card.hasName(nameToPutOnBattlefield, currentGame)) { askToPutOntoBf = true; cardToPutOnBf = card; }