* GUI: fixed broken mtgjson decks import (#7065);

Fixed typos in comments;
This commit is contained in:
Oleg Agafonov 2020-09-16 02:15:40 +04:00
parent 87caf1ddd1
commit 1db8d07cbd
7 changed files with 4410 additions and 4570 deletions

View file

@ -18,10 +18,11 @@ public class MtgjsonDeckImportTest {
return LOOKUP;
}
};
// offline deck from https://mtgjson.com/api/v5/decks/ArcaneTempo_GRN.json
DeckCardLists deck = importer.importDeck(
"src/test/java/mage/cards/decks/importer/samples/testdeck.json", errors, false);
assertEquals("Arcane Tempo", deck.getName());
TestDeckChecker.checker()
.addMain("Goblin Electromancer", 4)
.addMain("Crackling Drake", 4)
@ -41,6 +42,7 @@ public class MtgjsonDeckImportTest {
.addMain("Izzet Guildgate", 4)
.addMain("Island", 8)
.addMain("Mountain", 7)
//
.addSide("The Mirari Conjecture", 1)
.addSide("Beacon Bolt", 1)
.addSide("Negate", 3)
@ -48,6 +50,7 @@ public class MtgjsonDeckImportTest {
.addSide("Fiery Cannonade", 3)
.addSide("Shivan Fire", 2)
.addSide("Disdainful Stroke", 2)
//
.verify(deck, 60, 15);
assertEquals("", errors.toString());

View file

@ -1,52 +1,52 @@
package mage.cards.decks.importer;
import static org.junit.Assert.assertEquals;
import mage.cards.decks.DeckCardLists;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import mage.cards.decks.DeckCardLists;
import static org.junit.Assert.assertEquals;
public class TestDeckChecker {
private final List<String> main = new ArrayList<>();
private final List<String> side = new ArrayList<>();
private final List<String> main = new ArrayList<>();
private final List<String> side = new ArrayList<>();
public TestDeckChecker addMain(String name) {
return addMain(name, 1);
}
public TestDeckChecker addMain(String name, int quantity) {
main.addAll(Collections.nCopies(quantity, name));
return this;
}
public TestDeckChecker addSide(String name) {
return addSide(name, 1);
}
public TestDeckChecker addSide(String name, int quantity) {
side.addAll(Collections.nCopies(quantity, name));
return this;
}
public void verify(DeckCardLists deck, int nMain, int nSide) {
assertEquals(nMain, main.size());
assertEquals(nSide, side.size());
assertEquals(nMain, deck.getCards().size());
assertEquals(nSide, deck.getSideboard().size());
for (int i = 0; i < main.size(); i++) {
String expected = main.get(i);
String actual = deck.getCards().get(i).getCardName();
assertEquals(String.format("Expected: '%s' Actual: '%s' at index: %s",
expected, actual, i), expected, actual);
public TestDeckChecker addMain(String name) {
return addMain(name, 1);
}
}
public static TestDeckChecker checker() {
return new TestDeckChecker();
}
public TestDeckChecker addMain(String name, int quantity) {
main.addAll(Collections.nCopies(quantity, name));
return this;
}
public TestDeckChecker addSide(String name) {
return addSide(name, 1);
}
public TestDeckChecker addSide(String name, int quantity) {
side.addAll(Collections.nCopies(quantity, name));
return this;
}
public void verify(DeckCardLists deck, int nMain, int nSide) {
assertEquals("main deck size", nMain, main.size());
assertEquals("main deck loaded size", nMain, deck.getCards().size());
assertEquals("sideboard size", nSide, side.size());
assertEquals("sideboard loaded size", nSide, deck.getSideboard().size());
for (int i = 0; i < main.size(); i++) {
String expected = main.get(i);
String actual = deck.getCards().get(i).getCardName();
assertEquals(String.format("Expected: '%s' Actual: '%s' at index: %s",
expected, actual, i), expected, actual);
}
}
public static TestDeckChecker checker() {
return new TestDeckChecker();
}
}