From ef92e006d0caa6b450a07f10d8fdf8117e14fb93 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail.com>
Date: Fri, 15 Aug 2014 10:27:17 +0400
Subject: [PATCH] Forgot to commit

---
 .../test/lki/LastKnownInformationTest.java    | 40 +------------------
 .../java/org/mage/test/player/TestPlayer.java | 18 ++++-----
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java b/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java
index 2f2ff23fda8..33d4055c6e2 100644
--- a/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java
@@ -105,7 +105,7 @@ public class LastKnownInformationTest extends CardTestPlayerBase {
         execute();
 
         assertPermanentCount(playerA, "Grizzly Bears", 1);
-        assertLife(playerA, 27);
+        assertLife(playerA, 24);
     }
 
     /**
@@ -137,43 +137,5 @@ public class LastKnownInformationTest extends CardTestPlayerBase {
 
     }
 
-    @Test
-    public void testCardTestPlayerAPIImpl1() {
-        addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
-        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
-        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
-
-        addCard(Zone.HAND, playerA, "Last Breath");
-        addCard(Zone.HAND, playerA, "Shock");
-
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Last Breath", "Grizzly Bears");
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", "Grizzly Bears");
-
-        setStopAt(1, PhaseStep.END_TURN);
-        execute();
-
-        assertPermanentCount(playerA, "Grizzly Bears", 0);
-        assertLife(playerA, 20);
-    }
-
-    @Test
-    public void testCardTestPlayerAPIImpl2() {
-        addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
-        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
-        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
-
-        addCard(Zone.HAND, playerA, "Last Breath");
-        addCard(Zone.HAND, playerA, "Shock");
-
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Last Breath", "Grizzly Bears");
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", "Grizzly Bears", "Last Breath",
-                StackClause.WHILE_NOT_ON_STACK);
-
-        setStopAt(1, PhaseStep.END_TURN);
-        execute();
-
-        assertPermanentCount(playerA, "Grizzly Bears", 0);
-        assertLife(playerA, 24);
-    }
 
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index b930c7500e6..c17a6fef77c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -371,6 +371,14 @@ public class TestPlayer extends ComputerPlayer {
                 }
             }
             return false;
+        } else if (groups.length > 2 && groups[2].startsWith("!spellOnStack=")) {
+            String spellNotOnStack = groups[2].substring(14);
+            for (StackObject stackObject: game.getStack()) {
+                if (stackObject.getStackAbility().toString().equals(spellNotOnStack)) {
+                    return false;
+                }
+            }
+            return true;
         }
         return true;
     }
@@ -385,14 +393,6 @@ public class TestPlayer extends ComputerPlayer {
                 }
             }
             return false;
-        } else if (groups.length > 2 && groups[2].startsWith("!spellOnStack=")) {
-            String spellNotOnStack = groups[2].substring(14);
-            for (StackObject stackObject: game.getStack()) {
-                if (stackObject.getStackAbility().toString().equals(spellNotOnStack)) {
-                    return false;
-                }
-            }
-            return true;
         }
         return true;
     }
@@ -401,7 +401,7 @@ public class TestPlayer extends ComputerPlayer {
         boolean result = true;
         for (int i = 1; i < groups.length; i++) {
             String group = groups[i];
-            if (group.startsWith("spellOnStack") || group.startsWith("spellOnTopOfStack")) {
+            if (group.startsWith("spellOnStack") || group.startsWith("spellOnTopOfStack") || group.startsWith("!spellOnStack")) {
                 break;
             }
             if (ability instanceof SpellAbility && ((SpellAbility) ability).getSpellAbilityType().equals(SpellAbilityType.SPLIT_FUSED)) {