Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format

forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java

@@ -85,6 +85,7 @@ public abstract class StatTypeFilter<T extends InventoryItem> extends ToggleButt
                 buttonMap.get(statTypes).setText(String.valueOf(count));
             }
         }
+
         getWidget().revalidate();
     }
 }

forge-gui-desktop/src/test/java/forge/card/CardDbTestLazyCardLoading.java

@@ -89,4 +89,24 @@ public class CardDbTestLazyCardLoading extends ForgeCardMockTestCase {
         assertNotNull(aetherVialCard);
         assertEquals(aetherVialCard.getName(), expectedCardName);
     }
+
+    @Test
+    public void tesLoadAndGetUnsupportedCardHavingWrongSetCode(){
+        String cardName = "Dominating Licid";
+        String wrongSetCode = "AA";
+        String expectedSetCode = "EXO";  // Exodus
+        CardRarity expectedCardRarity = CardRarity.Rare;
+
+        PaperCard dominatingLycidCard = this.cardDb.getCard(cardName);
+        assertNull(dominatingLycidCard);
+
+        // Load the Card (just card name
+        FModel.getMagicDb().attemptToLoadCard(cardName, wrongSetCode);
+
+        dominatingLycidCard = this.cardDb.getCard(cardName);
+        assertNotNull(dominatingLycidCard);
+        assertEquals(dominatingLycidCard.getName(), cardName);
+        assertEquals(dominatingLycidCard.getEdition(), expectedSetCode);
+        assertEquals(dominatingLycidCard.getRarity(), expectedCardRarity);
+    }
 }

forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java

@@ -681,6 +681,12 @@ public class PlayerControllerForTests extends PlayerController {
         return null;
     }
 
+    @Override
+    public Card chooseDungeon(Player player, List<PaperCard> dungeonCards, String message) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
     @Override
     public List<Card> chooseCardsForSplice(SpellAbility sa, List<Card> cards) {
         return Lists.newArrayList();