diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index aed4188e87b..1d53278399e 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -97,7 +97,8 @@ public class VerifyCardDataTest { private static final List evergreenKeywords = Arrays.asList( "flying", "lifelink", "menace", "trample", "haste", "first strike", "hexproof", "fear", "deathtouch", "double strike", "indestructible", "reach", "flash", "defender", "vigilance", - "plainswalk", "islandwalk", "swampwalk", "mountainwalk", "forestwalk", "myriad", "prowess", "convoke" + "plainswalk", "islandwalk", "swampwalk", "mountainwalk", "forestwalk", "myriad", "prowess", "convoke", + "shroud", "banding", "flanking", "horsemanship", "legendary landwalk" ); private static final List doubleWords = new ArrayList<>(); @@ -269,8 +270,12 @@ public class VerifyCardDataTest { return skipListGet(listName).contains(set); } + /** + * For splitting printed rules text with multiple keywords on one line + */ private static boolean evergreenCheck(String s) { - return evergreenKeywords.contains(s) || s.startsWith("protection from") || s.startsWith("hexproof from") || s.startsWith("ward "); + return evergreenKeywords.contains(s) || s.startsWith("protection from") || s.startsWith("hexproof from") + || s.startsWith("ward ") || s.startsWith("rampage ") || s.startsWith("annihilator"); } private static boolean eqSet(Collection a, Collection b) { @@ -2304,11 +2309,11 @@ public class VerifyCardDataTest { private void checkWrongAbilitiesTextEnd() { // TODO: implement tests result/stats by github actions to show in check message compared to prev version - System.out.println(String.format("")); - System.out.println(String.format("Stats for %d cards checked for abilities text:", wrongAbilityStatsTotal)); - System.out.println(String.format(" - Cards with correct text: %5d (%.2f)", wrongAbilityStatsGood, wrongAbilityStatsGood * 100.0 / wrongAbilityStatsTotal)); - System.out.println(String.format(" - Cards with text errors: %5d (%.2f)", wrongAbilityStatsBad, wrongAbilityStatsBad * 100.0 / wrongAbilityStatsTotal)); - System.out.println(String.format("")); + System.out.println(); + System.out.printf("Stats for %d cards checked for abilities text:%n", wrongAbilityStatsTotal); + System.out.printf(" - Cards with correct text: %5d (%.2f)%n", wrongAbilityStatsGood, wrongAbilityStatsGood * 100.0 / wrongAbilityStatsTotal); + System.out.printf(" - Cards with text errors: %5d (%.2f)%n", wrongAbilityStatsBad, wrongAbilityStatsBad * 100.0 / wrongAbilityStatsTotal); + System.out.println(); } private void checkWrongAbilitiesText(Card card, MtgJsonCard ref, int cardIndex) { @@ -2380,15 +2385,11 @@ public class VerifyCardDataTest { if (ref.subtypes.contains("Adventure")) { for (int i = 0; i < refRules.length; i++) { - refRules[i] = new StringBuilder("Adventure ") - .append(ref.types.get(0)) - .append(" - ") - .append(ref.faceName) - .append(' ') - .append(ref.manaCost) - .append(" - ") - .append(refRules[i]) - .toString(); + refRules[i] = "Adventure " + + ref.types.get(0) + " - " + + ref.faceName + ' ' + + ref.manaCost + " - " + + refRules[i]; } }