From 8a69ea97e7c4d7999bcf722aced1e92fc40adf27 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Wed, 11 Aug 2021 01:45:12 +0400
Subject: [PATCH] Tests: fixed that some game errors can't be caught by test
 framework (related to d202278ccd6876f8113d26951e6bd018f6e9b792)

---
 .../abilities/effects/ContinuousEffects.java  |  2 +-
 Mage/src/main/java/mage/game/Game.java        |  5 ++---
 Mage/src/main/java/mage/game/GameImpl.java    | 19 +++++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
index 2aa92e4872f..0e8ac85bcfc 100644
--- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
+++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
@@ -1433,7 +1433,7 @@ public class ContinuousEffects implements Serializable {
     }
 
     /**
-     * Prints out a status of the currently existing continuous effects
+     * Debug only: prints out a status of the currently existing continuous effects
      *
      * @param game
      */
diff --git a/Mage/src/main/java/mage/game/Game.java b/Mage/src/main/java/mage/game/Game.java
index 786f71249b6..e8f0d8862da 100644
--- a/Mage/src/main/java/mage/game/Game.java
+++ b/Mage/src/main/java/mage/game/Game.java
@@ -37,6 +37,7 @@ import mage.game.turn.Turn;
 import mage.players.Player;
 import mage.players.PlayerList;
 import mage.players.Players;
+import mage.util.Copyable;
 import mage.util.MessageToClient;
 import mage.util.functions.CopyApplier;
 
@@ -44,7 +45,7 @@ import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
-public interface Game extends MageItem, Serializable {
+public interface Game extends MageItem, Serializable, Copyable<Game> {
 
     MatchType getGameType();
 
@@ -217,8 +218,6 @@ public interface Game extends MageItem, Serializable {
 
     void loadGameStates(GameStates states);
 
-    Game copy();
-
     boolean isSimulation();
 
     void setSimulation(boolean checkPlayableState);
diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java
index 08cc84d46b6..cd2c4fe71a6 100644
--- a/Mage/src/main/java/mage/game/GameImpl.java
+++ b/Mage/src/main/java/mage/game/GameImpl.java
@@ -59,10 +59,7 @@ import mage.target.Target;
 import mage.target.TargetCard;
 import mage.target.TargetPermanent;
 import mage.target.TargetPlayer;
-import mage.util.CardUtil;
-import mage.util.GameLog;
-import mage.util.MessageToClient;
-import mage.util.RandomUtil;
+import mage.util.*;
 import mage.util.functions.CopyApplier;
 import mage.watchers.Watcher;
 import mage.watchers.common.*;
@@ -74,10 +71,10 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-public abstract class GameImpl implements Game, Serializable {
+public abstract class GameImpl implements Game {
 
     private static final int ROLLBACK_TURNS_MAX = 4;
-
+    private static final String UNIT_TESTS_ERROR_TEXT = "Error in unit tests";
     private static final Logger logger = Logger.getLogger(GameImpl.class);
 
     private transient Object customData;
@@ -1489,7 +1486,7 @@ public abstract class GameImpl implements Game, Serializable {
                             errorContinueCounter++;
                             continue;
                         } else {
-                            throw new MageException("Error in unit tests");
+                            throw new MageException(UNIT_TESTS_ERROR_TEXT);
                         }
                     } finally {
                         setCheckPlayableState(false);
@@ -1498,9 +1495,15 @@ public abstract class GameImpl implements Game, Serializable {
                 }
             }
         } catch (Exception ex) {
-            logger.fatal("Game exception ", ex);
+            logger.fatal("Game exception " + ex.getMessage(), ex);
             this.fireErrorEvent("Game exception occurred: ", ex);
             this.end();
+
+            // don't catch game errors in unit tests, so test framework can process it (example: errors in AI simulations)
+            if (ex.getMessage() != null && ex.getMessage().equals(UNIT_TESTS_ERROR_TEXT)) {
+                //this.getContinuousEffects().traceContinuousEffects(this);
+                throw new IllegalStateException(UNIT_TESTS_ERROR_TEXT);
+            }
         } finally {
             resetLKI();
             clearAllBookmarks();