External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-18 17:29:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the Counters API for card and permanent consistent.

Browse source
This commit is contained in:
Samuel Sandeen 2016-09-03 10:33:54 -04:00
parent 277dc19fec
commit 148f633672
176 changed files with 272 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java
View file

@ -27,7 +27,7 @@ public class LevelUpAbilityTest extends CardTestPlayerBase {
execute();
Permanent master = getPermanent("Transcendent Master", playerA.getId());
Assert.assertTrue(master.getCounters().isEmpty());
Assert.assertTrue(master.getCounters(currentGame).isEmpty());
Assert.assertEquals(3, master.getPower().getValue());
Assert.assertEquals(3, master.getToughness().getValue());
@ -49,7 +49,7 @@ public class LevelUpAbilityTest extends CardTestPlayerBase {
execute();
Permanent master = getPermanent("Transcendent Master", playerA.getId());
Assert.assertEquals(1, master.getCounters().getCount(CounterType.LEVEL));
Assert.assertEquals(1, master.getCounters(currentGame).getCount(CounterType.LEVEL));
Assert.assertEquals(3, master.getPower().getValue());
Assert.assertEquals(3, master.getToughness().getValue());
@ -73,7 +73,7 @@ public class LevelUpAbilityTest extends CardTestPlayerBase {
execute();
Permanent master = getPermanent("Transcendent Master", playerA.getId());
Assert.assertEquals(6, master.getCounters().getCount(CounterType.LEVEL));
Assert.assertEquals(6, master.getCounters(currentGame).getCount(CounterType.LEVEL));
Assert.assertEquals(6, master.getPower().getValue());
Assert.assertEquals(6, master.getToughness().getValue());
@ -99,7 +99,7 @@ public class LevelUpAbilityTest extends CardTestPlayerBase {
execute();
Permanent master = getPermanent("Transcendent Master", playerA.getId());
Assert.assertEquals(12, master.getCounters().getCount(CounterType.LEVEL));
Assert.assertEquals(12, master.getCounters(currentGame).getCount(CounterType.LEVEL));
Assert.assertEquals("Power different", 9, master.getPower().getValue());
Assert.assertEquals("Toughness different", 9, master.getToughness().getValue());
@ -123,7 +123,7 @@ public class LevelUpAbilityTest extends CardTestPlayerBase {
execute();
Permanent master = getPermanent("Transcendent Master", playerA.getId());
Assert.assertEquals(15, master.getCounters().getCount(CounterType.LEVEL));
Assert.assertEquals(15, master.getCounters(currentGame).getCount(CounterType.LEVEL));
Assert.assertEquals("Power different", 9, master.getPower().getValue());
Assert.assertEquals("Toughness different", 9, master.getToughness().getValue());

2
Mage.Tests/src/test/java/org/mage/test/cards/copy/VesuvaTest.java
View file

@ -96,7 +96,7 @@ public class VesuvaTest extends CardTestPlayerBase {
Permanent darkDepth = getPermanent("Dark Depths", playerA);
if (darkDepth != null) {
Assert.assertEquals(10, darkDepth.getCounters().getCount("ice"));
Assert.assertEquals(10, darkDepth.getCounters(currentGame).getCount("ice"));
}
assertTappedCount("Dark Depths", true, 1);
}

2
Mage.Tests/src/test/java/org/mage/test/cards/single/ChronozoaTest.java
View file

@ -65,7 +65,7 @@ public class ChronozoaTest extends CardTestPlayerBase {
Assert.assertEquals("Chronozoa has to be a token", true, creature instanceof PermanentToken);
// Make sure each token has 2 time counters
final Counters counters = creature.getCounters();
final Counters counters = creature.getCounters(currentGame);
Assert.assertEquals(1, counters.size());
for(final Counter counter : counters.values()) {
Assert.assertEquals(CounterType.TIME.getName(), counter.getName());

2
Mage.Tests/src/test/java/org/mage/test/cards/single/DustOfMomentsTest.java
View file

@ -30,7 +30,7 @@ public class DustOfMomentsTest extends CardTestPlayerBase {
for (final Permanent creature : activeCreatures) {
Assert.assertEquals("Chronozoa", creature.getName());
Assert.assertEquals(3, creature.getCounters().getCount(CounterType.TIME));
Assert.assertEquals(3, creature.getCounters(currentGame).getCount(CounterType.TIME));
}
// Check time counters on kraken
assertCounterOnExiledCardCount("Deep-Sea Kraken", CounterType.TIME, 6);

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

@ -30,7 +30,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.mage.test.player.TestPlayer;
import org.mage.test.serverside.base.CardTestAPI;
import org.mage.test.serverside.base.CardTestAPI.GameResult;
import org.mage.test.serverside.base.MageTestPlayerBase;
/**
@ -637,7 +636,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
}
}
Assert.assertNotNull("There is no such permanent " + (player == null ? "" : "for player " + player.getName()) + " on the battlefield, cardName=" + cardName, found);
Assert.assertEquals("(Battlefield) Counter counts are not equal (" + cardName + ":" + type + ")", count, found.getCounters().getCount(type));
Assert.assertEquals("(Battlefield) Counter counts are not equal (" + cardName + ":" + type + ")", count, found.getCounters(currentGame).getCount(type));
}
/**