From d4ec65cddb8eb0d1726f625de6066f792fed6641 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 7 Jan 2020 17:56:26 +0100 Subject: [PATCH] Added Test and changed some log messages from info to debug. --- .../test/cards/planeswalker/VivienTest.java | 40 +++++++++++++++++++ .../test/serverside/base/MageTestBase.java | 4 +- .../serverside/base/MageTestPlayerBase.java | 4 +- .../base/impl/CardTestPlayerAPIImpl.java | 4 +- Mage/src/main/java/mage/game/GameImpl.java | 4 +- 5 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/VivienTest.java diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/VivienTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/VivienTest.java new file mode 100644 index 00000000000..5b4d62aa674 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/VivienTest.java @@ -0,0 +1,40 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.mage.test.cards.planeswalker; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import mage.counters.CounterType; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class VivienTest extends CardTestPlayerBase { + + @Test + public void VivienArkbowRangerAbility1NoTargetsTest() { + // +1: Distribute two +1/+1 counters among up to two target creatures. They gain trample until end of turn. + // −3: Target creature you control deals damage equal to its power to target creature or planeswalker. + // −5: You may choose a creature card you own from outside the game, reveal it, and put it into your hand. + addCard(Zone.HAND, playerA, "Vivien, Arkbow Ranger"); // Planeswalker {1}{G}{G}{G} - starts with 4 Loyality counters + addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Vivien, Arkbow Ranger"); + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Distribute"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Vivien, Arkbow Ranger", 1); + assertCounterCount("Vivien, Arkbow Ranger", CounterType.LOYALTY, 5); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java index 4c94e70c85c..a8573992fd8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java @@ -121,7 +121,7 @@ public abstract class MageTestBase { private static Class loadPlugin(Plugin plugin) { try { classLoader.addURL(new File(pluginFolder + '/' + plugin.getJar()).toURI().toURL()); - logger.info("Loading plugin: " + plugin.getClassName()); + logger.debug("Loading plugin: " + plugin.getClassName()); return Class.forName(plugin.getClassName(), true, classLoader); } catch (ClassNotFoundException ex) { logger.warn("Plugin not Found:" + plugin.getJar() + " - check plugin folder"); @@ -134,7 +134,7 @@ public abstract class MageTestBase { private static MatchType loadGameType(GamePlugin plugin) { try { classLoader.addURL(new File(pluginFolder + '/' + plugin.getJar()).toURI().toURL()); - logger.info("Loading game type: " + plugin.getClassName()); + logger.debug("Loading game type: " + plugin.getClassName()); return (MatchType) Class.forName(plugin.getTypeName(), true, classLoader).getConstructor().newInstance(); } catch (ClassNotFoundException ex) { logger.warn("Game type not found:" + plugin.getJar() + " - check plugin folder"); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java index 18da4cd1033..5b5b758af49 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java @@ -115,7 +115,7 @@ public abstract class MageTestPlayerBase { private static Class loadPlugin(Plugin plugin) { try { classLoader.addURL(new File(pluginFolder + '/' + plugin.getJar()).toURI().toURL()); - logger.info("Loading plugin: " + plugin.getClassName()); + logger.debug("Loading plugin: " + plugin.getClassName()); return Class.forName(plugin.getClassName(), true, classLoader); } catch (ClassNotFoundException ex) { logger.warn("Plugin not Found:" + plugin.getJar() + " - check plugin folder"); @@ -128,7 +128,7 @@ public abstract class MageTestPlayerBase { private static MatchType loadGameType(GamePlugin plugin) { try { classLoader.addURL(new File(pluginFolder + '/' + plugin.getJar()).toURI().toURL()); - logger.info("Loading game type: " + plugin.getClassName()); + logger.debug("Loading game type: " + plugin.getClassName()); return (MatchType) Class.forName(plugin.getTypeName(), true, classLoader).getConstructor().newInstance(); } catch (ClassNotFoundException ex) { logger.warn("Game type not found:" + plugin.getJar() + " - check plugin folder"); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java index 7fb9965c0d5..a5afdfc8020 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java @@ -46,7 +46,7 @@ import java.util.stream.Collectors; * @author ayratn */ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implements CardTestAPI { - + // Defines the constant if for activate ability is not target but a ability on the stack to define public static final String NO_TARGET = "NO_TARGET"; @@ -256,7 +256,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement currentGame.start(activePlayer.getId()); long t2 = System.nanoTime(); logger.debug("Winner: " + currentGame.getWinner()); - logger.info("Test has been executed. Execution time: " + (t2 - t1) / 1000000 + " ms"); + logger.info(Thread.currentThread().getStackTrace()[2].getMethodName() + " has been executed. Execution time: " + (t2 - t1) / 1000000 + " ms"); // TODO: 01.12.2018, JayDi85 - uncomment and fix MANY broken tests with wrong commands //assertAllCommandsUsed(); diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index 3980d56b383..c4f27191505 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -813,7 +813,7 @@ public abstract class GameImpl implements Game, Serializable { sb.append(']'); count++; } - logger.info(sb.toString()); + logger.debug(sb.toString()); } } @@ -2886,7 +2886,7 @@ public abstract class GameImpl implements Game, Serializable { try { Integer amount = Integer.parseInt(s[1]); player.setLife(amount, this, ownerId); - logger.info("Setting player's life: "); + logger.debug("Setting player's life: "); } catch (NumberFormatException e) { logger.fatal("error setting life", e); }