From 09a5ece9f301eb10110a06e2812b26ef6025c7be Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 27 Nov 2018 16:09:43 +0100 Subject: [PATCH] Fixed color check and added missing attribute to verify. --- Mage.Verify/src/main/java/mage/verify/JsonCard.java | 2 ++ .../src/test/java/mage/verify/VerifyCardDataTest.java | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Mage.Verify/src/main/java/mage/verify/JsonCard.java b/Mage.Verify/src/main/java/mage/verify/JsonCard.java index c7a0c49a4b..ef857d8d75 100644 --- a/Mage.Verify/src/main/java/mage/verify/JsonCard.java +++ b/Mage.Verify/src/main/java/mage/verify/JsonCard.java @@ -3,6 +3,7 @@ package mage.verify; import java.util.List; class JsonCard { + public String uuid; public String convertedManaCost; public List foreignData; @@ -56,4 +57,5 @@ class JsonCard { public boolean timeshifted; public String borderColor; public boolean isOversized; + public String faceConvertedManaCost; } diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index d170b83cd5..0ebbe0f3e4 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -575,11 +575,11 @@ public class VerifyCardDataTest { ObjectColor color = card.getColor(null); if (expected.size() != color.getColorCount() - || (color.isBlack() && !expected.contains("Black")) - || (color.isBlue() && !expected.contains("Blue")) - || (color.isGreen() && !expected.contains("Green")) - || (color.isRed() && !expected.contains("Red")) - || (color.isWhite() && !expected.contains("White"))) { + || (color.isBlack() && !expected.contains("B")) + || (color.isBlue() && !expected.contains("U")) + || (color.isGreen() && !expected.contains("G")) + || (color.isRed() && !expected.contains("R")) + || (color.isWhite() && !expected.contains("W"))) { fail(card, "colors", color + " != " + expected); } }