From d6fb986aa549533a620c367611b3e94e43d79874 Mon Sep 17 00:00:00 2001 From: paulsnoops Date: Sat, 8 Oct 2022 18:06:25 +0100 Subject: [PATCH] test_fixes_2 --- .../forge/card/CardDbCardMockTestCase.java | 2 +- ...CardEditionCollectionCardMockTestCase.java | 2 +- .../java/forge/deck/DeckRecognizerTest.java | 22 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java index 772c0f128b3..db1c5dc71c6 100644 --- a/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java +++ b/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java @@ -1755,7 +1755,7 @@ public class CardDbCardMockTestCase extends CardMockTestCase { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); alphaReleaseDate = format.parse(alphaEditionReleaseDate); - latestShivanDragonReleaseDateToDate = format.parse("2022-09-09"); + latestShivanDragonReleaseDateToDate = format.parse("2022-11-28"); } catch (ParseException e) { e.printStackTrace(); fail(); diff --git a/forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java index 92966cf2965..9a6d1cd14de 100644 --- a/forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java +++ b/forge-gui-desktop/src/test/java/forge/card/CardEditionCollectionCardMockTestCase.java @@ -41,7 +41,7 @@ public class CardEditionCollectionCardMockTestCase extends CardMockTestCase { CardDb cardDb = FModel.getMagicDb().getCommonCards(); String[] cardNames = { "Shivan Dragon", "Animate Wall", "Balance", "Blessing", "Force of Will" }; - String[] expectedSets = { "P30H", "MED", "SLD", "M14", "DMR" }; + String[] expectedSets = { "30A", "30A", "30A", "30A", "DMR" }; List cards = new ArrayList<>(); for (int i = 0; i < 5; i++) { String cardName = cardNames[i]; diff --git a/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java b/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java index 54cab8fc918..78dca04311b 100644 --- a/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java +++ b/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java @@ -1214,7 +1214,7 @@ public class DeckRecognizerTest extends CardMockTestCase { assertEquals(cardToken.getQuantity(), 4); assertEquals(tokenCard.getName(), "Power Sink"); assertFalse(tokenCard.isFoil()); - assertEquals(tokenCard.getEdition(), "VMA"); + assertEquals(tokenCard.getEdition(), "30A"); assertTrue(cardToken.cardRequestHasNoCode()); lineRequest = "4x Power Sink+"; @@ -1226,7 +1226,7 @@ public class DeckRecognizerTest extends CardMockTestCase { assertEquals(cardToken.getQuantity(), 4); assertEquals(tokenCard.getName(), "Power Sink"); assertTrue(tokenCard.isFoil()); - assertEquals(tokenCard.getEdition(), "VMA"); + assertEquals(tokenCard.getEdition(), "30A"); assertTrue(cardToken.cardRequestHasNoCode()); lineRequest = "Power Sink+"; @@ -1238,7 +1238,7 @@ public class DeckRecognizerTest extends CardMockTestCase { assertEquals(cardToken.getQuantity(), 1); assertEquals(tokenCard.getName(), "Power Sink"); assertTrue(tokenCard.isFoil()); - assertEquals(tokenCard.getEdition(), "VMA"); + assertEquals(tokenCard.getEdition(), "30A"); assertTrue(cardToken.cardRequestHasNoCode()); } @@ -1268,7 +1268,7 @@ public class DeckRecognizerTest extends CardMockTestCase { tokenCard = cardToken.getCard(); assertEquals(cardToken.getQuantity(), 2); assertEquals(tokenCard.getName(), "Counterspell"); - assertEquals(tokenCard.getEdition(), "MH2"); + assertEquals(tokenCard.getEdition(), "DMR"); assertTrue(cardToken.cardRequestHasNoCode()); } @@ -1593,7 +1593,7 @@ public class DeckRecognizerTest extends CardMockTestCase { //assertEquals(cardToken.getTokenSection(), DeckSection.Main); //fix test since signature spell is allowed on commander section PaperCard tc = cardToken.getCard(); assertEquals(tc.getName(), "Counterspell"); - assertEquals(tc.getEdition(), "MH2"); + assertEquals(tc.getEdition(), "DMR"); assertTrue(cardToken.cardRequestHasNoCode()); // Setting Original Core @@ -1625,7 +1625,7 @@ public class DeckRecognizerTest extends CardMockTestCase { assertEquals(cardToken.getQuantity(), 4); assertEquals(tokenCard.getName(), "Power Sink"); assertTrue(tokenCard.isFoil()); - assertEquals(tokenCard.getEdition(), "VMA"); + assertEquals(tokenCard.getEdition(), "30A"); assertTrue(cardToken.cardRequestHasNoCode()); recognizer.setArtPreference(CardDb.CardArtPreference.ORIGINAL_ART_CORE_EXPANSIONS_REPRINT_ONLY); @@ -1697,7 +1697,7 @@ public class DeckRecognizerTest extends CardMockTestCase { assertEquals(ancestralCard.getName(), "Ancestral Recall"); assertEquals(StaticData.instance().getCommonCards().getCardArtPreference(), CardDb.CardArtPreference.LATEST_ART_ALL_EDITIONS); - assertEquals(ancestralCard.getEdition(), "VMA"); + assertEquals(ancestralCard.getEdition(), "30A"); assertTrue(cardToken.cardRequestHasNoCode()); recognizer.setDeckFormatConstraint(DeckFormat.TinyLeaders); @@ -2325,7 +2325,7 @@ public class DeckRecognizerTest extends CardMockTestCase { assertNotNull(token.getCard()); PaperCard ancestralRecallCard = token.getCard(); assertEquals(ancestralRecallCard.getName(), "Ancestral Recall"); - assertEquals(ancestralRecallCard.getEdition(), "VMA"); + assertEquals(ancestralRecallCard.getEdition(), "30A"); } // === XMage Format @@ -3077,7 +3077,7 @@ public class DeckRecognizerTest extends CardMockTestCase { token = recognizer.recognizeLine(lineRequest, null); assertNotNull(token); assertEquals(token.getType(), TokenType.LEGAL_CARD); - assertEquals(token.getText(), "Ancestral Recall [VMA] #1"); + assertEquals(token.getText(), "Ancestral Recall [30A] #47"); assertNotNull(token.getCard()); assertNotNull(token.getTokenSection()); assertEquals(token.getTokenSection(), DeckSection.Sideboard); @@ -3087,7 +3087,7 @@ public class DeckRecognizerTest extends CardMockTestCase { token = recognizer.recognizeLine(lineRequest, null); assertNotNull(token); assertEquals(token.getType(), TokenType.LEGAL_CARD); - assertEquals(token.getText(), "Ancestral Recall [VMA] #1"); + assertEquals(token.getText(), "Ancestral Recall [30A] #47"); assertNotNull(token.getCard()); assertNotNull(token.getTokenSection()); assertEquals(token.getTokenSection(), DeckSection.Sideboard); @@ -3097,7 +3097,7 @@ public class DeckRecognizerTest extends CardMockTestCase { token = recognizer.recognizeLine(lineRequest, null); assertNotNull(token); assertEquals(token.getType(), TokenType.LEGAL_CARD); - assertEquals(token.getText(), "Ancestral Recall [VMA] #1"); + assertEquals(token.getText(), "Ancestral Recall [30A] #47"); assertNotNull(token.getCard()); assertTrue(token.cardRequestHasNoCode());