github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tests: fixed that some game errors can't be caught by test framework (related to d202278ccd)

Browse source
This commit is contained in:
Oleg Agafonov 2021-08-11 01:45:12 +04:00
parent 4a8f9d9308
commit 8a69ea97e7
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
View file

@ -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 * @param game
*/ */

5
Mage/src/main/java/mage/game/Game.java
View file

@ -37,6 +37,7 @@ import mage.game.turn.Turn;
import mage.players.Player; import mage.players.Player;
import mage.players.PlayerList; import mage.players.PlayerList;
import mage.players.Players; import mage.players.Players;
import mage.util.Copyable;
import mage.util.MessageToClient; import mage.util.MessageToClient;
import mage.util.functions.CopyApplier; import mage.util.functions.CopyApplier;
@ -44,7 +45,7 @@ import java.io.Serializable;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public interface Game extends MageItem, Serializable { public interface Game extends MageItem, Serializable, Copyable<Game> {
MatchType getGameType(); MatchType getGameType();
@ -217,8 +218,6 @@ public interface Game extends MageItem, Serializable {
void loadGameStates(GameStates states); void loadGameStates(GameStates states);
Game copy();
boolean isSimulation(); boolean isSimulation();
void setSimulation(boolean checkPlayableState); void setSimulation(boolean checkPlayableState);

19
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -59,10 +59,7 @@ import mage.target.Target;
import mage.target.TargetCard; import mage.target.TargetCard;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.TargetPlayer; import mage.target.TargetPlayer;
import mage.util.CardUtil; import mage.util.*;
import mage.util.GameLog;
import mage.util.MessageToClient;
import mage.util.RandomUtil;
import mage.util.functions.CopyApplier; import mage.util.functions.CopyApplier;
import mage.watchers.Watcher; import mage.watchers.Watcher;
import mage.watchers.common.*; import mage.watchers.common.*;
@ -74,10 +71,10 @@ import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.stream.Collectors; 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 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 static final Logger logger = Logger.getLogger(GameImpl.class);
private transient Object customData; private transient Object customData;
@ -1489,7 +1486,7 @@ public abstract class GameImpl implements Game, Serializable {
errorContinueCounter++; errorContinueCounter++;
continue; continue;
} else { } else {
throw new MageException("Error in unit tests"); throw new MageException(UNIT_TESTS_ERROR_TEXT);
} }
} finally { } finally {
setCheckPlayableState(false); setCheckPlayableState(false);
@ -1498,9 +1495,15 @@ public abstract class GameImpl implements Game, Serializable {
} }
} }
} catch (Exception ex) { } catch (Exception ex) {
logger.fatal("Game exception ", ex); logger.fatal("Game exception " + ex.getMessage(), ex);
this.fireErrorEvent("Game exception occurred: ", ex); this.fireErrorEvent("Game exception occurred: ", ex);
this.end(); 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 { } finally {
resetLKI(); resetLKI();
clearAllBookmarks(); clearAllBookmarks();