Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Draft Cubes rework (better cube from deck, dynamic data, better errors processing, actual MTGO Vintage Cube) (#13705)

Browse source 
- GUI, table: added dynamic data support for Cube Types (no more depends on server's config names, part of #12050);
- server: replace multiple MTGO Vintage Cubes by single cube, updated to April 2025 (part of #12050);
- server: fixed table freeze on starting error (related to #11285);
- GUI, table: added better support of Cube From Deck (client/server side errors, additional info about loaded cards, etc);
This commit is contained in:
Oleg Agafonov 2025-05-31 20:15:31 +04:00 • committed by GitHub
parent 2034b3fe59
commit 3d45a24959
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 755 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -24,6 +24,8 @@ import mage.abilities.hint.common.MonarchHint;
import mage.abilities.keyword.*;
import mage.cards.*;
import mage.cards.decks.CardNameUtil;
import mage.cards.decks.Deck;
import mage.cards.decks.DeckCardInfo;
import mage.cards.decks.DeckCardLists;
import mage.cards.decks.importer.DeckImporter;
import mage.cards.repository.*;
@ -42,6 +44,7 @@ import mage.game.permanent.token.custom.CreatureToken;
import mage.game.permanent.token.custom.XmageToken;
import mage.sets.TherosBeyondDeath;
import mage.target.targetpointer.TargetPointer;
import mage.tournament.cubes.CubeFromDeck;
import mage.util.CardUtil;
import mage.utils.SystemUtil;
import mage.verify.mtgjson.MtgJsonCard;
@ -3090,7 +3093,7 @@ public class VerifyCardDataTest {
}
@Test
public void test_checkCardsInCubes() {
public void test_checkCardsInCubes() throws Exception {
Reflections reflections = new Reflections("mage.tournament.cubes.");
Set<Class<? extends DraftCube>> cubesList = reflections.getSubTypesOf(DraftCube.class);
Assert.assertFalse("Can't find any cubes", cubesList.isEmpty());
@ -3103,7 +3106,24 @@ public class VerifyCardDataTest {
continue;
}
DraftCube cube = (DraftCube) createNewObject(cubeClass);
// cube from deck must use real deck to check complete
DraftCube cube;
if (cubeClass.isAssignableFrom(CubeFromDeck.class)) {
DeckCardLists deckCardLists = new DeckCardLists();
deckCardLists.setCards(Arrays.asList(
new DeckCardInfo("Adanto Vanguard", "1", "XLN"),
new DeckCardInfo("Boneyard Parley", "94", "XLN"),
new DeckCardInfo("Forest", "276", "XLN")
));
Deck deck = Deck.load(deckCardLists, true);
Constructor<?> con = cubeClass.getConstructor(Deck.class);
cube = (DraftCube) con.newInstance(deck);
Assert.assertFalse(deckCardLists.getCards().isEmpty());
Assert.assertEquals("deck must be loaded to cube", cube.getCubeCards().size(), deckCardLists.getCards().size());
Assert.assertTrue("cube's name must contains cards count", cube.getName().contains(deckCardLists.getCards().size() + " cards"));
} else {
cube = (DraftCube) createNewObject(cubeClass);
}
if (cube.getCubeCards().isEmpty()) {
errorsList.add("Error: broken cube, empty cards list: " + cube.getClass().getCanonicalName());
}