From b0e2845b590585ddc6a834ea6f13c53e8f9c05b5 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Mon, 14 Jan 2019 06:19:39 +0400 Subject: [PATCH] Fixed verify tests to ignore mtgjson updates --- Mage.Verify/src/main/java/mage/verify/JsonCard.java | 5 +++++ Mage.Verify/src/main/java/mage/verify/JsonForeignData.java | 5 +++++ Mage.Verify/src/main/java/mage/verify/JsonSet.java | 5 +++++ Mage.Verify/src/main/java/mage/verify/JsonToken.java | 5 +++++ Mage.Verify/src/main/java/mage/verify/MtgJson.java | 2 ++ 5 files changed, 22 insertions(+) diff --git a/Mage.Verify/src/main/java/mage/verify/JsonCard.java b/Mage.Verify/src/main/java/mage/verify/JsonCard.java index d01d9c8ba0..bb85a00e7d 100644 --- a/Mage.Verify/src/main/java/mage/verify/JsonCard.java +++ b/Mage.Verify/src/main/java/mage/verify/JsonCard.java @@ -1,7 +1,12 @@ package mage.verify; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +import static mage.verify.MtgJson.MTGJSON_IGNORE_NEW_PROPERTIES; + +@JsonIgnoreProperties(ignoreUnknown = MTGJSON_IGNORE_NEW_PROPERTIES) class JsonCard { // docs: https://mtgjson.com/v4/docs.html diff --git a/Mage.Verify/src/main/java/mage/verify/JsonForeignData.java b/Mage.Verify/src/main/java/mage/verify/JsonForeignData.java index c6ca9353e4..5c85acd664 100644 --- a/Mage.Verify/src/main/java/mage/verify/JsonForeignData.java +++ b/Mage.Verify/src/main/java/mage/verify/JsonForeignData.java @@ -1,5 +1,10 @@ package mage.verify; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import static mage.verify.MtgJson.MTGJSON_IGNORE_NEW_PROPERTIES; + +@JsonIgnoreProperties(ignoreUnknown = MTGJSON_IGNORE_NEW_PROPERTIES) public class JsonForeignData { public String flavorText; public String language; diff --git a/Mage.Verify/src/main/java/mage/verify/JsonSet.java b/Mage.Verify/src/main/java/mage/verify/JsonSet.java index 614d73123d..d53d310d04 100644 --- a/Mage.Verify/src/main/java/mage/verify/JsonSet.java +++ b/Mage.Verify/src/main/java/mage/verify/JsonSet.java @@ -1,7 +1,12 @@ package mage.verify; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +import static mage.verify.MtgJson.MTGJSON_IGNORE_NEW_PROPERTIES; + +@JsonIgnoreProperties(ignoreUnknown = MTGJSON_IGNORE_NEW_PROPERTIES) class JsonSet { public int baseSetSize; public String block; diff --git a/Mage.Verify/src/main/java/mage/verify/JsonToken.java b/Mage.Verify/src/main/java/mage/verify/JsonToken.java index 92237ae01f..c348485689 100644 --- a/Mage.Verify/src/main/java/mage/verify/JsonToken.java +++ b/Mage.Verify/src/main/java/mage/verify/JsonToken.java @@ -1,7 +1,12 @@ package mage.verify; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +import static mage.verify.MtgJson.MTGJSON_IGNORE_NEW_PROPERTIES; + +@JsonIgnoreProperties(ignoreUnknown = MTGJSON_IGNORE_NEW_PROPERTIES) public class JsonToken { public String artist; public String borderColor; diff --git a/Mage.Verify/src/main/java/mage/verify/MtgJson.java b/Mage.Verify/src/main/java/mage/verify/MtgJson.java index 11f147029a..5eb355d472 100644 --- a/Mage.Verify/src/main/java/mage/verify/MtgJson.java +++ b/Mage.Verify/src/main/java/mage/verify/MtgJson.java @@ -24,6 +24,8 @@ public final class MtgJson { public static Map mtgJsonToXMageCodes = new HashMap<>(); public static Map xMageToMtgJsonCodes = new HashMap<>(); + public static final boolean MTGJSON_IGNORE_NEW_PROPERTIES = true; // set it to false for full mtgjson checks and research (new fields finds or mtgjson updates) + static { mtgJsonToXMageCodes.put("pWCQ", "WMCQ"); mtgJsonToXMageCodes.put("pSUS", "SUS");