From ea6a094aa25a97692cee426c4946147821df6d03 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 21 Feb 2013 00:18:33 +0100 Subject: [PATCH] Fixed some bugs in test cases and changed check for existing abilities to containsRule() method if ability is no singleton. --- .../test/cards/abilities/activated/LevelUpAbilityTest.java | 4 ++-- .../org/mage/test/cards/asthough/AlchemistsRefugeTest.java | 4 ++-- .../test/cards/continuous/MasterOfThePearlTridentTest.java | 2 ++ .../java/org/mage/test/cards/copy/PhantasmalImageTest.java | 6 +++--- .../test/serverside/base/impl/CardTestPlayerAPIImpl.java | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java index 3bbd39c6b1c..0d73856d971 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java @@ -103,7 +103,7 @@ public class LevelUpAbilityTest extends CardTestPlayerBase { Assert.assertEquals("Power different", 9, master.getPower().getValue()); Assert.assertEquals("Toughness different", 9, master.getToughness().getValue()); Assert.assertTrue(master.getAbilities().contains(LifelinkAbility.getInstance())); - Assert.assertTrue(master.getAbilities().contains(new IndestructibleAbility())); + Assert.assertTrue(master.getAbilities().containsRule(new IndestructibleAbility())); } /** @@ -127,7 +127,7 @@ public class LevelUpAbilityTest extends CardTestPlayerBase { Assert.assertEquals("Power different", 9, master.getPower().getValue()); Assert.assertEquals("Toughness different", 9, master.getToughness().getValue()); Assert.assertTrue(master.getAbilities().contains(LifelinkAbility.getInstance())); - Assert.assertTrue(master.getAbilities().contains(new IndestructibleAbility())); + Assert.assertTrue(master.getAbilities().containsRule(new IndestructibleAbility())); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AlchemistsRefugeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AlchemistsRefugeTest.java index f615dfd6bcb..daa44ed12e1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AlchemistsRefugeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AlchemistsRefugeTest.java @@ -20,7 +20,7 @@ public class AlchemistsRefugeTest extends CardTestPlayerBase { addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); - activateAbility(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{G}{U}, {tap}:"); + activateAbility(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{G}{U}, {T}:"); castSpell(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); @@ -65,7 +65,7 @@ public class AlchemistsRefugeTest extends CardTestPlayerBase { addCard(Constants.Zone.BATTLEFIELD, playerA, "Plains"); addCard(Constants.Zone.HAND, playerA, "Elite Vanguard"); - activateAbility(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{G}{U}, {tap}:"); + activateAbility(2, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "{G}{U}, {T}:"); castSpell(4, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Elite Vanguard"); setStopAt(4, Constants.PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java index e6e7f1248ed..b269a61f712 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java @@ -1,6 +1,8 @@ package org.mage.test.cards.continuous; +import junit.framework.Assert; import mage.Constants; +import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.IslandwalkAbility; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java index 4bacdac8a52..0855f0c21d1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java @@ -84,13 +84,13 @@ public class PhantasmalImageTest extends CardTestPlayerBase { Assert.assertEquals("Power different", 9, master.getPower().getValue()); Assert.assertEquals("Toughness different", 9, master.getToughness().getValue()); Assert.assertTrue(master.getAbilities().contains(LifelinkAbility.getInstance())); - Assert.assertTrue(master.getAbilities().contains(new IndestructibleAbility())); + Assert.assertTrue(master.getAbilities().containsRule(new IndestructibleAbility())); // But copied one should not Assert.assertEquals("Power different", 3, masterCopied.getPower().getValue()); Assert.assertEquals("Toughness different", 3, masterCopied.getToughness().getValue()); Assert.assertFalse(masterCopied.getAbilities().contains(LifelinkAbility.getInstance())); - Assert.assertFalse(masterCopied.getAbilities().contains(new IndestructibleAbility())); + Assert.assertFalse(masterCopied.getAbilities().containsRule(new IndestructibleAbility())); } /** @@ -103,7 +103,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase { addCard(Constants.Zone.BATTLEFIELD, playerA, "Illusionary Servant"); setChoice(playerA, "Illusionary Servant"); - setChoice(playerA, "Illusionary Servant-M12"); + setChoice(playerA, "Illusionary Servant-M10"); castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Phantasmal Image"); 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 5383e4ffc9c..8e61184c6bd 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 @@ -388,10 +388,10 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement if (flag) { Assert.assertTrue("No such ability=" + ability.toString() + ", player=" + player.getName() + - ", cardName" + cardName, found.getAbilities().contains(ability)); + ", cardName" + cardName, found.getAbilities().containsRule(ability)); } else { Assert.assertFalse("Card shouldn't have such ability=" + ability.toString() + ", player=" + player.getName() + - ", cardName" + cardName, found.getAbilities().contains(ability)); + ", cardName" + cardName, found.getAbilities().containsRule(ability)); } }