From f83b427e63500e558c6c6de8348462fbe549ec4c Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 6 Oct 2020 19:48:54 -0400 Subject: [PATCH] updated verify check to ignore legendary creature text shortening --- .../java/mage/verify/VerifyCardDataTest.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index fc5b9c17af0..e968da905ed 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -1417,6 +1417,19 @@ public class VerifyCardDataTest { } }*/ + private static final boolean compareText(String cardText, String refText, String name) { + if (cardText.equals(refText)) { + return true; + } + if (cardText.replace(name, name.split(", ")[0]).equals(refText)) { + return true; + } + if (cardText.replace(name, name.split(" ")[0]).equals(refText)) { + return true; + } + return false; + } + private void checkWrongAbilitiesText(Card card, MtgJsonCard ref, int cardIndex) { // checks missing or wrong text if (!card.getExpansionSetCode().equals(FULL_ABILITIES_CHECK_SET_CODE)) { @@ -1446,8 +1459,8 @@ public class VerifyCardDataTest { String replacement = Arrays .stream(s.split(", ")) .map(CardUtil::getTextWithFirstCharUpperCase) - .reduce("", (a, b) -> a + "\n" + b); - refText = refText.replace(s, replacement); + .reduce("", (a, b) -> a + '\n' + b); + refText = refText.replace(s, replacement.substring(1)); } } @@ -1466,7 +1479,7 @@ public class VerifyCardDataTest { boolean isAbilityFounded = false; for (int j = 0; j <= refRules.length - 1; j++) { String refRule = refRules[j]; - if (cardRules[i].equals(refRule)) { + if (compareText(cardRules[i], refRule, card.getName())) { cardRules[i] = "+ " + cardRules[i]; refRules[j] = "+ " + refRules[j]; isAbilityFounded = true;