added additional subtype verification skips
@@ -48,6 +48,7 @@ public class VerifyCardDataTest {
private static final boolean CHECK_SOURCE_TOKENS = false;
private static final HashMap<String, Set<String>> skipCheckLists = new HashMap<>();
+ private static final Set<String> subtypesToIgnore = new HashSet<>();
private static void skipListCreate(String listName) {
skipCheckLists.put(listName, new LinkedHashSet<>());
@@ -93,7 +94,9 @@ public class VerifyCardDataTest {
// subtype
skipListCreate("SUBTYPE");
skipListAddName("SUBTYPE", "UGL", "Miss Demeanor");
- skipListAddName("SUBTYPE", "M10", "Dread Warlock");
+
+ subtypesToIgnore.add("Noble");
+ subtypesToIgnore.add("Warlock");
// number
skipListCreate("NUMBER");
@@ -669,8 +672,20 @@ public class VerifyCardDataTest {
}
}
- if (!eqSet(card.getSubtype(null).stream().map(SubType::toString).collect(Collectors.toSet()), expected)) {
- fail(card, "subtypes", card.getSubtype(null) + " != " + expected);
+ // Remove subtypes that need to be ignored
+ Collection<String> actual = card
+ .getSubtype(null)
+ .stream()
+ .map(SubType::toString)
+ .collect(Collectors.toSet());
+ actual.removeIf(subtypesToIgnore::contains);
+
+ if (expected != null) {
+ expected.removeIf(subtypesToIgnore::contains);
+ }
+
+ if (!eqSet(actual, expected)) {
+ fail(card, "subtypes", actual + " != " + expected);
}
}
