External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-21 18:59:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed canTarget error and started to convert logging to log4j

Browse source
This commit is contained in:
BetaSteward 2011-02-14 14:41:29 -05:00
parent c8fcc25ba2
commit 0c5261ce88
10 changed files with 137 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java
View file

@ -127,16 +127,16 @@ public class PlayGameTest extends MageTestBase {
if (card != null) {
cards.add(card);
} else {
logger.severe("Couldn't find a card: " + cardName);
logger.severe("line: " + line);
logger.fatal("Couldn't find a card: " + cardName);
logger.fatal("line: " + line);
}
}
}
} else {
logger.warning("Unknown player: " + nickname);
logger.warn("Unknown player: " + nickname);
}
} else {
logger.warning("Init string wasn't parsed: " + line);
logger.warn("Init string wasn't parsed: " + line);
}
}
} finally {

22
Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java
View file

@ -11,20 +11,19 @@ import mage.server.util.PluginClassLoader;
import mage.server.util.config.GamePlugin;
import mage.server.util.config.Plugin;
import mage.util.Copier;
import mage.util.Logging;
import org.junit.BeforeClass;
import java.io.File;
import java.io.FilenameFilter;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import java.util.regex.Pattern;
/**
* @author ayratn
*/
public class MageTestBase {
protected static Logger logger = Logging.getLogger(MageTestBase.class.getName());
protected static Logger logger = Logger.getLogger(MageTestBase.class);
public static PluginClassLoader classLoader = new PluginClassLoader();
@ -34,8 +33,9 @@ public class MageTestBase {
@BeforeClass
public static void init() {
Logger.getRootLogger().setLevel(Level.DEBUG);
logger.info("Starting MAGE tests");
logger.info("Logging level: " + Logging.getLevel(logger));
logger.info("Logging level: " + logger.getLevel());
deleteSavedGames();
ConfigSettings config = ConfigSettings.getInstance();
for (GamePlugin plugin : config.getGameTypes()) {
@ -59,9 +59,9 @@ public class MageTestBase {
logger.info("Loading plugin: " + plugin.getClassName());
return Class.forName(plugin.getClassName(), true, classLoader);
} catch (ClassNotFoundException ex) {
logger.log(Level.SEVERE, "Plugin not Found:" + plugin.getJar() + " - check plugin folder");
logger.warn("Plugin not Found:" + plugin.getJar() + " - check plugin folder");
} catch (Exception ex) {
logger.log(Level.SEVERE, "Error loading plugin " + plugin.getJar(), ex);
logger.fatal("Error loading plugin " + plugin.getJar(), ex);
}
return null;
}
@ -72,9 +72,9 @@ public class MageTestBase {
logger.info("Loading game type: " + plugin.getClassName());
return (MatchType) Class.forName(plugin.getTypeName(), true, classLoader).newInstance();
} catch (ClassNotFoundException ex) {
logger.log(Level.SEVERE, "Game type not found:" + plugin.getJar() + " - check plugin folder");
logger.warn("Game type not found:" + plugin.getJar() + " - check plugin folder");
} catch (Exception ex) {
logger.log(Level.SEVERE, "Error loading game type " + plugin.getJar(), ex);
logger.fatal("Error loading game type " + plugin.getJar(), ex);
}
return null;
}
@ -85,9 +85,9 @@ public class MageTestBase {
logger.info("Loading tournament type: " + plugin.getClassName());
return (TournamentType) Class.forName(plugin.getTypeName(), true, classLoader).newInstance();
} catch (ClassNotFoundException ex) {
logger.log(Level.SEVERE, "Tournament type not found:" + plugin.getJar() + " - check plugin folder");
logger.warn("Tournament type not found:" + plugin.getJar() + " - check plugin folder");
} catch (Exception ex) {
logger.log(Level.SEVERE, "Error loading game type " + plugin.getJar(), ex);
logger.fatal("Error loading game type " + plugin.getJar(), ex);
}
return null;
}