test_fixes_2

This commit is contained in:
paulsnoops
2022-10-08 18:06:25 +01:00
parent 5cb1024a50
commit d6fb986aa5
3 changed files with 13 additions and 13 deletions

View File

@@ -1755,7 +1755,7 @@ public class CardDbCardMockTestCase extends CardMockTestCase {
try { try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
alphaReleaseDate = format.parse(alphaEditionReleaseDate); alphaReleaseDate = format.parse(alphaEditionReleaseDate);
latestShivanDragonReleaseDateToDate = format.parse("2022-09-09"); latestShivanDragonReleaseDateToDate = format.parse("2022-11-28");
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
fail(); fail();

View File

@@ -41,7 +41,7 @@ public class CardEditionCollectionCardMockTestCase extends CardMockTestCase {
CardDb cardDb = FModel.getMagicDb().getCommonCards(); CardDb cardDb = FModel.getMagicDb().getCommonCards();
String[] cardNames = { "Shivan Dragon", "Animate Wall", "Balance", "Blessing", "Force of Will" }; 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<PaperCard> cards = new ArrayList<>(); List<PaperCard> cards = new ArrayList<>();
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
String cardName = cardNames[i]; String cardName = cardNames[i];

View File

@@ -1214,7 +1214,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
assertEquals(cardToken.getQuantity(), 4); assertEquals(cardToken.getQuantity(), 4);
assertEquals(tokenCard.getName(), "Power Sink"); assertEquals(tokenCard.getName(), "Power Sink");
assertFalse(tokenCard.isFoil()); assertFalse(tokenCard.isFoil());
assertEquals(tokenCard.getEdition(), "VMA"); assertEquals(tokenCard.getEdition(), "30A");
assertTrue(cardToken.cardRequestHasNoCode()); assertTrue(cardToken.cardRequestHasNoCode());
lineRequest = "4x Power Sink+"; lineRequest = "4x Power Sink+";
@@ -1226,7 +1226,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
assertEquals(cardToken.getQuantity(), 4); assertEquals(cardToken.getQuantity(), 4);
assertEquals(tokenCard.getName(), "Power Sink"); assertEquals(tokenCard.getName(), "Power Sink");
assertTrue(tokenCard.isFoil()); assertTrue(tokenCard.isFoil());
assertEquals(tokenCard.getEdition(), "VMA"); assertEquals(tokenCard.getEdition(), "30A");
assertTrue(cardToken.cardRequestHasNoCode()); assertTrue(cardToken.cardRequestHasNoCode());
lineRequest = "Power Sink+"; lineRequest = "Power Sink+";
@@ -1238,7 +1238,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
assertEquals(cardToken.getQuantity(), 1); assertEquals(cardToken.getQuantity(), 1);
assertEquals(tokenCard.getName(), "Power Sink"); assertEquals(tokenCard.getName(), "Power Sink");
assertTrue(tokenCard.isFoil()); assertTrue(tokenCard.isFoil());
assertEquals(tokenCard.getEdition(), "VMA"); assertEquals(tokenCard.getEdition(), "30A");
assertTrue(cardToken.cardRequestHasNoCode()); assertTrue(cardToken.cardRequestHasNoCode());
} }
@@ -1268,7 +1268,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
tokenCard = cardToken.getCard(); tokenCard = cardToken.getCard();
assertEquals(cardToken.getQuantity(), 2); assertEquals(cardToken.getQuantity(), 2);
assertEquals(tokenCard.getName(), "Counterspell"); assertEquals(tokenCard.getName(), "Counterspell");
assertEquals(tokenCard.getEdition(), "MH2"); assertEquals(tokenCard.getEdition(), "DMR");
assertTrue(cardToken.cardRequestHasNoCode()); 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 //assertEquals(cardToken.getTokenSection(), DeckSection.Main); //fix test since signature spell is allowed on commander section
PaperCard tc = cardToken.getCard(); PaperCard tc = cardToken.getCard();
assertEquals(tc.getName(), "Counterspell"); assertEquals(tc.getName(), "Counterspell");
assertEquals(tc.getEdition(), "MH2"); assertEquals(tc.getEdition(), "DMR");
assertTrue(cardToken.cardRequestHasNoCode()); assertTrue(cardToken.cardRequestHasNoCode());
// Setting Original Core // Setting Original Core
@@ -1625,7 +1625,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
assertEquals(cardToken.getQuantity(), 4); assertEquals(cardToken.getQuantity(), 4);
assertEquals(tokenCard.getName(), "Power Sink"); assertEquals(tokenCard.getName(), "Power Sink");
assertTrue(tokenCard.isFoil()); assertTrue(tokenCard.isFoil());
assertEquals(tokenCard.getEdition(), "VMA"); assertEquals(tokenCard.getEdition(), "30A");
assertTrue(cardToken.cardRequestHasNoCode()); assertTrue(cardToken.cardRequestHasNoCode());
recognizer.setArtPreference(CardDb.CardArtPreference.ORIGINAL_ART_CORE_EXPANSIONS_REPRINT_ONLY); 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(ancestralCard.getName(), "Ancestral Recall");
assertEquals(StaticData.instance().getCommonCards().getCardArtPreference(), assertEquals(StaticData.instance().getCommonCards().getCardArtPreference(),
CardDb.CardArtPreference.LATEST_ART_ALL_EDITIONS); CardDb.CardArtPreference.LATEST_ART_ALL_EDITIONS);
assertEquals(ancestralCard.getEdition(), "VMA"); assertEquals(ancestralCard.getEdition(), "30A");
assertTrue(cardToken.cardRequestHasNoCode()); assertTrue(cardToken.cardRequestHasNoCode());
recognizer.setDeckFormatConstraint(DeckFormat.TinyLeaders); recognizer.setDeckFormatConstraint(DeckFormat.TinyLeaders);
@@ -2325,7 +2325,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
assertNotNull(token.getCard()); assertNotNull(token.getCard());
PaperCard ancestralRecallCard = token.getCard(); PaperCard ancestralRecallCard = token.getCard();
assertEquals(ancestralRecallCard.getName(), "Ancestral Recall"); assertEquals(ancestralRecallCard.getName(), "Ancestral Recall");
assertEquals(ancestralRecallCard.getEdition(), "VMA"); assertEquals(ancestralRecallCard.getEdition(), "30A");
} }
// === XMage Format // === XMage Format
@@ -3077,7 +3077,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
token = recognizer.recognizeLine(lineRequest, null); token = recognizer.recognizeLine(lineRequest, null);
assertNotNull(token); assertNotNull(token);
assertEquals(token.getType(), TokenType.LEGAL_CARD); 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.getCard());
assertNotNull(token.getTokenSection()); assertNotNull(token.getTokenSection());
assertEquals(token.getTokenSection(), DeckSection.Sideboard); assertEquals(token.getTokenSection(), DeckSection.Sideboard);
@@ -3087,7 +3087,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
token = recognizer.recognizeLine(lineRequest, null); token = recognizer.recognizeLine(lineRequest, null);
assertNotNull(token); assertNotNull(token);
assertEquals(token.getType(), TokenType.LEGAL_CARD); 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.getCard());
assertNotNull(token.getTokenSection()); assertNotNull(token.getTokenSection());
assertEquals(token.getTokenSection(), DeckSection.Sideboard); assertEquals(token.getTokenSection(), DeckSection.Sideboard);
@@ -3097,7 +3097,7 @@ public class DeckRecognizerTest extends CardMockTestCase {
token = recognizer.recognizeLine(lineRequest, null); token = recognizer.recognizeLine(lineRequest, null);
assertNotNull(token); assertNotNull(token);
assertEquals(token.getType(), TokenType.LEGAL_CARD); 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.getCard());
assertTrue(token.cardRequestHasNoCode()); assertTrue(token.cardRequestHasNoCode());