magefree#2841 UT unable to duplicate

drmDev · Mar 18, 2017 · 212385e · 212385e
1 parent 5ec6519
commit 212385e
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 4 deletions.
diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java
@@ -355,7 +355,7 @@ public void testMustAttackButCannotAttackAlone()
         addCard(Zone.BATTLEFIELD, playerA, flunkies);
         addCard(Zone.BATTLEFIELD, playerB, gAssault);
 
-        setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
+        setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
         execute();
 
         assertTapped(flunkies, false);

diff --git a/...combat/WatcherInTheWebMultipleBlocks.java → ...est/combat/CanBlockMultipleCreatures.java b/...combat/WatcherInTheWebMultipleBlocks.java → ...est/combat/CanBlockMultipleCreatures.java
@@ -37,7 +37,7 @@
  *
  * @author jeffwadsworth
  */
-public class WatcherInTheWebMultipleBlocks extends CardTestPlayerBase {
+public class CanBlockMultipleCreatures extends CardTestPlayerBase {
 
     // test must be ignored until creature blocking multiple supported by test framework
     @Ignore
@@ -73,5 +73,47 @@ public void testCombat() {
         assertLife(playerA, 19);
 
     }
-
-}
+
+    /*
+     * Reported bug: Night Market Guard was able to block a creature with Menace
+    */
+    @Test
+    public void testNightMarketGuardShouldNotBlockCreatureWithMenace()
+    {
+        /*
+        Night Market Guard {3} 3/1
+    Artifact Creature — Construct
+    Night Market Guard can block an additional creature each combat.
+        */
+        String nMarketGuard = "Night Market Guard";
+
+        /*
+        Embraal Bruiser {1}{B}
+        Creature - Human Warrior
+    Embraal Bruiser enters the battlefield tapped.
+    Embraal Bruiser has menace as long as you control an artifact.
+        */
+        String eBruiser = "Embraal Bruiser";
+
+        /* 
+        {0} 1/1
+         * Artifact Creature — Construct
+        */
+        String memnite = "Memnite";
+
+        addCard(Zone.BATTLEFIELD, playerA, nMarketGuard);
+        addCard(Zone.BATTLEFIELD, playerB, eBruiser);
+        addCard(Zone.BATTLEFIELD, playerB, memnite); // only here to grant Embraal Menace
+
+        attack(4, playerB, eBruiser);
+        block(4, playerA, nMarketGuard, eBruiser);
+
+        setStopAt(4, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertTapped(eBruiser, true);        
+        assertLife(playerA, 17); // could not block, so 3 damage goes through
+        assertPermanentCount(playerA, nMarketGuard, 1);
+        assertPermanentCount(playerB, eBruiser, 1);               
+    }
+}