From 8e178478e2d46ed0841e851a3496940f1ff42288 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sat, 24 Dec 2011 19:33:24 +0400
Subject: [PATCH] [Mage.Tests] Now all tests work.

---
 .../BugDoesntAttackWithZephyrSpriteTest.java}     |  5 ++---
 .../ai => ai/bugs}/BugTapsItselfTest.java         |  3 +--
 .../serverside/base/impl/CardTestAPIImpl.java     | 15 +++++++--------
 3 files changed, 10 insertions(+), 13 deletions(-)
 rename Mage.Tests/src/test/java/org/mage/test/{serverside/ai/BugDoesntAttackWithKnightTest.java => ai/bugs/BugDoesntAttackWithZephyrSpriteTest.java} (83%)
 rename Mage.Tests/src/test/java/org/mage/test/{serverside/ai => ai/bugs}/BugTapsItselfTest.java (90%)

diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/ai/BugDoesntAttackWithKnightTest.java b/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackWithZephyrSpriteTest.java
similarity index 83%
rename from Mage.Tests/src/test/java/org/mage/test/serverside/ai/BugDoesntAttackWithKnightTest.java
rename to Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackWithZephyrSpriteTest.java
index 99e83a767b2..3ea94e9f201 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/ai/BugDoesntAttackWithKnightTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackWithZephyrSpriteTest.java
@@ -1,4 +1,4 @@
-package org.mage.test.serverside.ai;
+package org.mage.test.ai.bugs;
 
 import mage.Constants;
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.mage.test.serverside.base.CardTestBase;
  *
  * @ayratn
  */
-public class BugDoesntAttackWithKnightTest extends CardTestBase {
+public class BugDoesntAttackWithZephyrSpriteTest extends CardTestBase {
 
 	@Test
 	public void testVersusInfectCreature() throws Exception {
@@ -30,6 +30,5 @@ public class BugDoesntAttackWithKnightTest extends CardTestBase {
 		assertResult(playerA, GameResult.WON);
 		// life:ComputerA:20
 		assertLife(playerA, 20);
-
 	}
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/ai/BugTapsItselfTest.java b/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugTapsItselfTest.java
similarity index 90%
rename from Mage.Tests/src/test/java/org/mage/test/serverside/ai/BugTapsItselfTest.java
rename to Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugTapsItselfTest.java
index a56e171d8cd..ee8b182050c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/ai/BugTapsItselfTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugTapsItselfTest.java
@@ -1,4 +1,4 @@
-package org.mage.test.serverside.ai;
+package org.mage.test.ai.bugs;
 
 import junit.framework.Assert;
 import mage.Constants;
@@ -17,7 +17,6 @@ import org.mage.test.serverside.base.CardTestBase;
 public class BugTapsItselfTest extends CardTestBase {
 
 	@Test
-    @Ignore
 	public void testVersusInfectCreature() throws Exception {
 		useWhiteDefault();
 		addCard(Constants.Zone.BATTLEFIELD, playerA, "Blinding Mage");
diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java
index 099b6476392..040909257cd 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java
+++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestAPIImpl.java
@@ -1,8 +1,5 @@
 package org.mage.test.serverside.base.impl;
 
-import java.util.List;
-import java.util.UUID;
-
 import mage.Constants;
 import mage.abilities.Ability;
 import mage.cards.Card;
@@ -11,11 +8,13 @@ import mage.game.permanent.Permanent;
 import mage.game.permanent.PermanentCard;
 import mage.players.Player;
 import mage.sets.Sets;
-
 import org.junit.Assert;
 import org.mage.test.serverside.base.CardTestAPI;
 import org.mage.test.serverside.base.MageTestBase;
 
+import java.util.List;
+import java.util.UUID;
+
 /**
  * API for test initialization and asserting the test results.
  *
@@ -207,17 +206,17 @@ public abstract class CardTestAPIImpl extends MageTestBase implements CardTestAP
 	public void assertResult(Player player, GameResult result) throws AssertionError {
 		if (player.equals(playerA)) {
 			GameResult actual = CardTestAPI.GameResult.DRAW;
-			if (currentGame.getWinner().equals("Player ComputerA is the winner")) {
+			if (currentGame.getWinner().equals("Player PlayerA is the winner")) {
 				actual = CardTestAPI.GameResult.WON;
-			} else if (currentGame.getWinner().equals("Player ComputerB is the winner")) {
+			} else if (currentGame.getWinner().equals("Player PlayerB is the winner")) {
 				actual = CardTestAPI.GameResult.LOST;
 			}
 			Assert.assertEquals("Game results are not equal", result, actual);
 		} else if (player.equals(playerB)) {
 			GameResult actual = CardTestAPI.GameResult.DRAW;
-			if (currentGame.getWinner().equals("Player ComputerB is the winner")) {
+			if (currentGame.getWinner().equals("Player PlayerB is the winner")) {
 				actual = CardTestAPI.GameResult.WON;
-			} else if (currentGame.getWinner().equals("Player ComputerA is the winner")) {
+			} else if (currentGame.getWinner().equals("Player PlayerA is the winner")) {
 				actual = CardTestAPI.GameResult.LOST;
 			}
 			Assert.assertEquals("Game results are not equal", result, actual);