External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 20:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: Delete Unused useWhiteDefault() Test Method (#9095)

Browse source 
* Format CardTestAPIImpl.java and CardTestPlayerAPIImpl.java

* Delete unused useWhiteDefault() test method

* Address JayDi's formatting feedback

Co-authored-by: DeepCrimson <>
This commit is contained in:
DeepCrimson 2022-06-16 21:38:16 -07:00 • committed by GitHub
parent 08740b1b04
commit ce33b5f218
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java
View file

@ -1,10 +1,10 @@
package org.mage.test.serverside.base.impl;
import mage.constants.PhaseStep;
import mage.abilities.Ability;
import mage.cards.Card;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.filter.Filter;
import mage.game.permanent.Permanent;
@ -51,23 +51,6 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP
addCard(Zone.LIBRARY, playerB, "Plains", 10);
}
/**
* Default game initialization params for white player (that plays with Plains)
*/
public void useWhiteDefault() {
// *** ComputerA ***
addCard(Zone.BATTLEFIELD, playerA, "Plains", 5);
addCard(Zone.HAND, playerA, "Plains", 5);
removeAllCardsFromLibrary(playerA);
addCard(Zone.LIBRARY, playerA, "Plains", 10);
// *** ComputerB ***
addCard(Zone.BATTLEFIELD, playerB, "Plains", 2);
addCard(Zone.HAND, playerB, "Plains", 2);
removeAllCardsFromLibrary(playerB);
addCard(Zone.LIBRARY, playerB, "Plains", 10);
}
/**
* Removes all cards from player's library from the game.
* Usually this should be used once before initialization to form the library in certain order.
@ -186,9 +169,9 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP
@Override
public void setLife(TestPlayer player, int life) {
if (player.equals(playerA)) {
commandsA.put(Zone.OUTSIDE, "life:" + String.valueOf(life));
commandsA.put(Zone.OUTSIDE, "life:" + life);
} else if (player.equals(playerB)) {
commandsB.put(Zone.OUTSIDE, "life:" + String.valueOf(life));
commandsB.put(Zone.OUTSIDE, "life:" + life);
}
}
@ -392,25 +375,25 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP
}
public void playLand(Player player, String cardName) {
player.addAction("play:"+cardName);
player.addAction("play:" + cardName);
}
public void castSpell(Player player, String cardName) {
player.addAction("cast:"+cardName);
player.addAction("cast:" + cardName);
}
public void addFixedTarget(Player player, String cardName, Player target) {
player.addAction("cast:"+cardName + ";name=" + target.getName());
player.addAction("cast:" + cardName + ";name=" + target.getName());
}
public void addFixedTarget(Player player, String cardName, String targetName) {
player.addAction("cast:"+cardName + ";name=" + targetName);
player.addAction("cast:" + cardName + ";name=" + targetName);
}
public void useAbility(Player player, String cardName) {
}
public void attack(Player player, String cardName) {
player.addAction("attack:"+cardName);
player.addAction("attack:" + cardName);
}
}

109
Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
View file

@ -64,14 +64,6 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
public static final String AI_PREFIX = "ai:"; // prefix for all ai commands
public static final String RUN_PREFIX = "run:"; // prefix for all run commands
static {
// aliases can be used in check commands, so all prefixes and delimeters must be unique
// already uses by targets: ^ $ [ ]
Assert.assertFalse("prefix must be unique", CHECK_PARAM_DELIMETER.contains(ALIAS_PREFIX));
Assert.assertFalse("prefix must be unique", CHECK_PREFIX.contains(ALIAS_PREFIX));
Assert.assertFalse("prefix must be unique", ALIAS_PREFIX.contains(CHECK_PREFIX));
}
// prefix for activate commands
// can be called with alias, example: @card_ref ability text
public static final String ACTIVATE_ABILITY = "activate:";
@ -86,12 +78,6 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
// commands for run
public static final String RUN_COMMAND_CODE = "code";
static {
// cards can be played/casted by activate ability command too
assertTrue("musts contains activate ability part", ACTIVATE_PLAY.startsWith(ACTIVATE_ABILITY));
assertTrue("musts contains activate ability part", ACTIVATE_CAST.startsWith(ACTIVATE_ABILITY));
}
// TODO: add target player param to commands
public static final String CHECK_COMMAND_PT = "PT";
public static final String CHECK_COMMAND_DAMAGE = "DAMAGE";
@ -132,6 +118,20 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
// TODO: add target player param to commands
public static final String ALIAS_COMMAND_ADD = "ADD";
static {
// aliases can be used in check commands, so all prefixes and delimeters must be unique
// already uses by targets: ^ $ [ ]
Assert.assertFalse("prefix must be unique", CHECK_PARAM_DELIMETER.contains(ALIAS_PREFIX));
Assert.assertFalse("prefix must be unique", CHECK_PREFIX.contains(ALIAS_PREFIX));
Assert.assertFalse("prefix must be unique", ALIAS_PREFIX.contains(CHECK_PREFIX));
}
static {
// cards can be played/casted by activate ability command too
assertTrue("musts contains activate ability part", ACTIVATE_PLAY.startsWith(ACTIVATE_ABILITY));
assertTrue("musts contains activate ability part", ACTIVATE_CAST.startsWith(ACTIVATE_ABILITY));
}
protected GameOptions gameOptions;
protected String deckNameA;
@ -143,15 +143,6 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
private boolean rollbackBlockActive = false;
private TestPlayer rollbackPlayer = null;
protected enum ExpectedType {
TURN_NUMBER,
RESULT,
LIFE,
BATTLEFIELD,
GRAVEYARD,
UNKNOWN
}
public CardTestPlayerAPIImpl() {
// load all cards to db from class list
ArrayList<String> errorsList = new ArrayList<>();
@ -192,24 +183,6 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
addCard(Zone.LIBRARY, playerB, "Plains", 10);
}
/**
* Default game initialization params for white player (that plays with
* Plains)
*/
public void useWhiteDefault() {
// *** ComputerA ***
addCard(Zone.BATTLEFIELD, playerA, "Plains", 5);
addCard(Zone.HAND, playerA, "Plains", 5);
removeAllCardsFromLibrary(playerA);
addCard(Zone.LIBRARY, playerA, "Plains", 10);
// *** ComputerB ***
addCard(Zone.BATTLEFIELD, playerB, "Plains", 2);
addCard(Zone.HAND, playerB, "Plains", 2);
removeAllCardsFromLibrary(playerB);
addCard(Zone.LIBRARY, playerB, "Plains", 10);
}
/**
* @throws GameException
* @throws FileNotFoundException
@ -442,24 +415,24 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
/**
* Checks whether or not a given playable ability (someting that lets you cast a card) is available.
* This function will only check IF the ability is available or not, it does not check the number of times that it's available.
*
* <p>
* If using with mustHave = false be very careful about spelling and options, otherwise you may get a false negative.
* It is reccomended that you set up the test so that the ability is available at the point you wish to check it,
* check it with checkPlayableAbility(..., mustHave = true), then add whatever condition would stop you from being
* able to activat the abiltiy
*
* <p>
* TODO: Currently does not work in all cases since some effects list abilities as available,
* only to then give a pop-up about how it can't be played.
* For examples and things to fix, search for:
* "try {
* execute();"
*
* @param checkName String to show up if the check fails, for display purposes only.
* @param turnNum The turn number to check on.
* @param step The step to check the ability on.
* @param player The player to be checked for the ability.
* @param abilityStartText The starting portion of the ability name.
* @param mustHave Whether the ability should be activatable of not
* @param checkName String to show up if the check fails, for display purposes only.
* @param turnNum The turn number to check on.
* @param step The step to check the ability on.
* @param player The player to be checked for the ability.
* @param abilityStartText The starting portion of the ability name.
* @param mustHave Whether the ability should be activatable of not
*/
public void checkPlayableAbility(String checkName, int turnNum, PhaseStep step, TestPlayer player, String abilityStartText, Boolean mustHave) {
check(checkName, turnNum, step, player, CHECK_COMMAND_PLAYABLE_ABILITY, abilityStartText, mustHave.toString());
@ -1596,13 +1569,13 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
.filter(permanent -> permanent.isControlledBy(thePlayer.getId()))
.filter(permanent -> permanent.getName().equals(thePermanent))
.collect(Collectors.toList());
assertTrue(theAttachment + " was not attached to " + thePermanent,
permanents.stream()
.anyMatch(permanent -> permanent.getAttachments()
.stream()
.map(id -> currentGame.getCard(id))
.map(MageObject::getName)
.collect(Collectors.toList()).contains(theAttachment)));
assertTrue(theAttachment + " was not attached to " + thePermanent,
permanents.stream()
.anyMatch(permanent -> permanent.getAttachments()
.stream()
.map(id -> currentGame.getCard(id))
.map(MageObject::getName)
.collect(Collectors.toList()).contains(theAttachment)));
}
@ -1785,12 +1758,6 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
addPlayerAction(player, turnNum, step, ACTIVATE_CAST + cardName + "$target=" + targetName);
}
public enum StackClause {
WHILE_ON_STACK,
WHILE_COPY_ON_STACK,
WHILE_NOT_ON_STACK
}
/**
* Spell will only be cast, if a spell / ability with the given name is on
* the stack
@ -2052,7 +2019,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
/**
* Set next result of next die roll (uses for both normal or planar rolls)
*
* <p>
* For planar rolls:
* 1..2 - chaos
* 3..7 - blank
@ -2194,7 +2161,6 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
}
}
public void assertWonTheGame(Player player) {
assertTrue(player.getName() + " has not won the game.", player.hasWon());
@ -2219,4 +2185,19 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
// prepare client-server data for tests
return GameSessionPlayer.prepareGameView(currentGame, player.getId(), null);
}
protected enum ExpectedType {
TURN_NUMBER,
RESULT,
LIFE,
BATTLEFIELD,
GRAVEYARD,
UNKNOWN
}
public enum StackClause {
WHILE_ON_STACK,
WHILE_COPY_ON_STACK,
WHILE_NOT_ON_STACK
}
}