External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 04:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: added support of TargetStackObject (example: counter activated or triggered ability)

Browse source
This commit is contained in:
Oleg Agafonov 2024-06-26 10:17:25 +04:00
parent 2d717f9f36
commit c3903dc550
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -41,6 +41,7 @@ import mage.game.match.MatchPlayer;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentToken;
import mage.game.stack.Spell;
import mage.game.stack.StackAbility;
import mage.game.stack.StackObject;
import mage.game.tournament.Tournament;
import mage.player.ai.ComputerPlayer;
@ -54,7 +55,6 @@ import mage.util.RandomUtil;
import org.apache.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
import static org.mage.test.serverside.base.impl.CardTestPlayerAPIImpl.*;
import java.io.Serializable;
import java.util.*;
@ -62,6 +62,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static org.mage.test.serverside.base.impl.CardTestPlayerAPIImpl.*;
/**
* Basic implementation of testable player
*
@ -430,10 +432,12 @@ public class TestPlayer implements Player {
}
// two search mode: for cards/permanents (strict) and for abilities (like)
if (object instanceof Ability) {
return object.getName().startsWith(nameOrAlias);
} else if (object instanceof Spell) {
if (object instanceof Spell) {
return ((Spell) object).getSpellAbility().getName().startsWith(nameOrAlias);
} else if (object instanceof StackAbility) {
return object.toString().startsWith(nameOrAlias);
} else if (object instanceof Ability) {
return object.getName().startsWith(nameOrAlias);
} else {
return object.getName().equals(nameOrAlias);
}
@ -2643,7 +2647,10 @@ public class TestPlayer implements Player {
}
// stack
if (target.getOriginalTarget() instanceof TargetSpell) {
// TODO: AI code uses same code, so it must support it, search by getOriginalTarget() instanceof TargetSpell
if (target.getOriginalTarget() instanceof TargetSpell
|| target.getOriginalTarget() instanceof TargetSpellOrPermanent
|| target.getOriginalTarget() instanceof TargetStackObject) {
for (String targetDefinition : targets.stream().limit(takeMaxTargetsPerChoose).collect(Collectors.toList())) {
checkTargetDefinitionMarksSupport(target, targetDefinition, "^");
String[] targetList = targetDefinition.split("\\^");