From 5c3a1c0c7214ebfe704a26411a6ba61d93994580 Mon Sep 17 00:00:00 2001
From: igoudt <igoudt@bol.com>
Date: Fri, 12 May 2017 23:14:47 +0200
Subject: [PATCH] extra tests for kiraGreatGlassSpinner

---
 .../watchers/KiraGreatGlassSpinnerTest.java   | 59 ++++++++++++++++---
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/KiraGreatGlassSpinnerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/KiraGreatGlassSpinnerTest.java
index ade57ada5a..17e66d2107 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/KiraGreatGlassSpinnerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/KiraGreatGlassSpinnerTest.java
@@ -10,21 +10,21 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  * Created by IGOUDT on 30-3-2017.
  */
 public class KiraGreatGlassSpinnerTest extends CardTestPlayerBase {
-    
+    /*
+       Kira, Great Glass-Spinner  {1}{U}{U}
+       Legendary Creature - Spirit 2/2
+       Flying
+       Creatures you control have "Whenever this creature becomes the target of a spell or ability for the first time each turn, counter that spell or ability."
+       */
     private final String kira = "Kira, Great Glass-Spinner";
+    private final String ugin = "Ugin, the Spirit Dragon";
 
     @Test
     public void counterFirst() {
-        
-        String ugin = "Ugin, the Spirit Dragon";
+
         addCard(Zone.BATTLEFIELD, playerA, ugin); // starts with 7 Loyality counters
 
-        /*
-        Kira, Great Glass-Spinner  {1}{U}{U}
-        Legendary Creature - Spirit 2/2
-        Flying
-        Creatures you control have "Whenever this creature becomes the target of a spell or ability for the first time each turn, counter that spell or ability."
-        */
+
         addCard(Zone.BATTLEFIELD, playerA, kira);
         activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: {source} deals 3 damage to target creature or player.", kira); // Ugin ability
 
@@ -34,4 +34,45 @@ public class KiraGreatGlassSpinnerTest extends CardTestPlayerBase {
         assertPermanentCount(playerA, kira, 1);
         assertCounterCount(playerA, ugin, CounterType.LOYALTY, 9);
     }
+
+    @Test
+    public void counterFirstResolveSecond() {
+
+        String ugin = "Ugin, the Spirit Dragon";
+        addCard(Zone.BATTLEFIELD, playerA, ugin); // starts with 7 Loyality counters
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
+        addCard(Zone.HAND, playerA, "Unsummon", 1);
+
+
+        addCard(Zone.BATTLEFIELD, playerA, kira);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: {source} deals 3 damage to target creature or player.", kira); // Ugin ability
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unsummon", kira);
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, kira, 0);
+        assertCounterCount(playerA, ugin, CounterType.LOYALTY, 9);
+        assertGraveyardCount(playerA, "Unsummon", 1);
+    }
+
+    @Test
+    public void counterFirstThisTurn_counterFirstOnNextTurn() {
+
+        addCard(Zone.BATTLEFIELD, playerA, ugin); // starts with 7 Loyality counters
+
+        addCard(Zone.BATTLEFIELD, playerA, kira);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: {source} deals 3 damage to target creature or player.", kira); // Ugin ability
+        activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: {source} deals 3 damage to target creature or player.", kira); // Ugin ability
+
+
+        setStopAt(3, PhaseStep.END_TURN);
+        execute();
+
+        assertPermanentCount(playerA, kira, 1);
+        assertCounterCount(playerA, ugin, CounterType.LOYALTY, 11);
+    }
+
+
 }