github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tests: fixed NykthosShrineToNyx that broke dozens of other tests with mana choice

Browse source
This commit is contained in:
Oleg Agafonov 2017-12-29 17:10:07 +04:00
parent 5d5c724565
commit e87db19b7d
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/n/NykthosShrineToNyx.java
View file

@ -94,7 +94,7 @@ class NykthosShrineToNyxManaAbility extends ActivatedManaAbilityImpl {
public List<Mana> getNetMana(Game game) {
netMana.clear();
if (game != null) {
for (String colorChoice : ChoiceColor.colorChoices) {
for (String colorChoice : ChoiceColor.getBaseColors()) {
netMana.add(((NykthosDynamicManaEffect) this.getEffects().get(0)).computeMana(colorChoice, game, this));
}
}

20
Mage/src/main/java/mage/choices/ChoiceColor.java
View file

@ -37,19 +37,20 @@ import java.util.Set;
/**
*
* @author BetaSteward_at_googlemail.com
* @author BetaSteward_at_googlemail.com, JayDi85
*/
public class ChoiceColor extends ChoiceImpl {
//public static final Set<String> colorChoices = new HashSet<>(); // JayDi85: uncomment 1 of 2 to broke unit tests find wrong tests (?)
public static final ArrayList<String> colorChoices = new ArrayList<>();
private static final ArrayList<String> colorChoices = getBaseColors();
static {
colorChoices.add("Green");
colorChoices.add("Blue");
colorChoices.add("Black");
colorChoices.add("Red");
colorChoices.add("White");
public static ArrayList<String> getBaseColors(){
ArrayList<String> arr = new ArrayList<>();
arr.add("Green");
arr.add("Blue");
arr.add("Black");
arr.add("Red");
arr.add("White");
return arr;
}
public ChoiceColor() {
@ -72,7 +73,6 @@ public class ChoiceColor extends ChoiceImpl {
super(required);
this.choices.addAll(colorChoices);
//this.setChoices(colorChoices); // JayDi85: uncomment 2 of 2 to broke unit tests find wrong tests (?)
this.setMessage(chooseMessage);
this.setSubMessage(chooseSubMessage);