diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index 3231e8e16f..e889244b22 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -30,6 +30,10 @@ jspf-core 0.9.1 + + org.slf4j + slf4j-log4j12 + log4j log4j @@ -100,7 +104,7 @@ truevfs-profile-base net.java.truevfs jar - 0.10.6 + 0.10.8 truevfs-access-swing @@ -150,7 +154,7 @@ org.apache.maven.plugins maven-install-plugin - 2.3.1 + 2.5.2 maven-resources-plugin diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java index 1b6b880692..d8246a8a9d 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -443,7 +443,7 @@ public class ConnectDialog extends MageDialog { try { in = new BufferedReader(new InputStreamReader(serverListURL.openConnection(p).getInputStream())); } catch (FileNotFoundException| UnknownHostException ex ) { - logger.info("Could not read serverlist from: " + serverListURL.toString()); + logger.warn("Could not read serverlist from: " + serverListURL.toString()); File f = new File("serverlist.txt"); if (f.exists() && !f.isDirectory()) { logger.info("Using buffered serverlist: serverlist.txt"); @@ -465,7 +465,7 @@ public class ConnectDialog extends MageDialog { String inputLine; while ((inputLine = in.readLine()) != null) { - logger.info("Found server: " + inputLine); + logger.debug("Found server: " + inputLine); servers.add(inputLine); if (output != null) { output.append(inputLine).append('\n'); diff --git a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml index 6df0ecc147..a7f06e82ae 100644 --- a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml @@ -28,8 +28,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml index de2e1cfc94..aef5a8e5c7 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml @@ -39,8 +39,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index 20f28dbd8a..461172aaab 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -42,7 +42,7 @@ com.sun.xml.bind jaxb-impl - 2.1.12 + 2.1.17 log4j @@ -140,7 +140,7 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.7.4 + 0.12.3 mage.server.util.config ./src/main/xml-resources/jaxb/Config/ @@ -157,7 +157,6 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 1.7 1.7 diff --git a/Mage.Stats/pom.xml b/Mage.Stats/pom.xml index 6c3adbafef..bea4836e2f 100644 --- a/Mage.Stats/pom.xml +++ b/Mage.Stats/pom.xml @@ -44,13 +44,13 @@ net.minidev json-smart - 1.1.1 + 2.1.1 org.aspectj aspectjrt - 1.6.11 + 1.8.2 @@ -63,38 +63,32 @@ org.jboss.resteasy resteasy-jaxrs - 2.3.5.Final + 2.3.7.Final provided ch.qos.logback logback-classic - 1.0.10 + 1.1.2 org.apache.sling org.apache.sling.commons.json - 2.0.6 - - - - org.apache.commons - commons-io - 1.3.2 + 2.0.10 org.jboss.resteasy resteasy-multipart-provider - 2.2.0.GA + 2.3.1.GA commons-io commons-io - 2.0.1 + 2.4 @@ -106,15 +100,14 @@ javax.servlet servlet-api - 2.4 + 2.5 joda-time joda-time - 2.2 + 2.7 - @@ -124,7 +117,6 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 1.7 1.7 @@ -133,7 +125,7 @@ org.apache.maven.plugins maven-war-plugin - 2.4 + 2.6 src\main\webapp\WEB-INF\web.xml . @@ -142,7 +134,7 @@ org.codehaus.mojo aspectj-maven-plugin - 1.4 + 1.7 diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml index 76df1cacda..f034956546 100644 --- a/Mage.Tests/pom.xml +++ b/Mage.Tests/pom.xml @@ -57,32 +57,33 @@ log4j jar + - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - -XX:MaxPermSize=512m - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - - maven-resources-plugin - 2.6 - - UTF-8 - - - + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dfile.encoding=UTF-8 + + + + org.apache.maven.plugins + maven-compiler-plugin + + -Xlint:unchecked + + + + maven-resources-plugin + + UTF-8 + + + mage-tests diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java index 0d4ab6fe2d..a0b1c41a29 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java @@ -1,12 +1,12 @@ package org.mage.test.cards.abilities.activated; -import junit.framework.Assert; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.LifelinkAbility; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java index e98cb25507..798ad7a137 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java @@ -1,9 +1,7 @@ package org.mage.test.cards.abilities.enters; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; -import mage.game.permanent.Permanent; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java index d6ae457813..c02029055b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java @@ -1,9 +1,9 @@ package org.mage.test.cards.abilities.enters; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java index a23967da8a..6b3a732531 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java @@ -1,9 +1,9 @@ package org.mage.test.cards.abilities.enters; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java index e71f2fd432..017aa0d9c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java @@ -28,11 +28,11 @@ package org.mage.test.cards.abilities.keywords; -import junit.framework.Assert; import mage.constants.CardType; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java index 731aadf685..5f2859f6c1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java @@ -6,11 +6,11 @@ package org.mage.test.cards.abilities.keywords; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.Filter; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java index 7b69cc9fde..4a7dc29324 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java @@ -2,6 +2,7 @@ package org.mage.test.cards.abilities.keywords; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; +import mage.abilities.Ability; import mage.abilities.keyword.LifelinkAbility; import mage.constants.PhaseStep; import mage.constants.Zone; @@ -346,7 +347,7 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { assertPowerToughness(playerA, "Nearheath Pilgrim", 2, 1); assertPowerToughness(playerA, "Elite Vanguard", 2, 1); - Abilities abilities = new AbilitiesImpl(); + Abilities abilities = new AbilitiesImpl<>(); abilities.add(LifelinkAbility.getInstance()); assertAbilities(playerA, "Nearheath Pilgrim", abilities); assertAbilities(playerA, "Elite Vanguard", abilities); @@ -373,7 +374,7 @@ public class SoulbondKeywordTest extends CardTestPlayerBase { Permanent trustedForcemange = getPermanent("Trusted Forcemage", playerA.getId()); Permanent eliteVanguard = getPermanent("Elite Vanguard", playerA.getId()); - Assert.assertTrue(trustedForcemange.getPairedCard() == null); - Assert.assertTrue(eliteVanguard.getPairedCard() == null); + Assert.assertEquals(trustedForcemange.getPairedCard(), null); + Assert.assertEquals(eliteVanguard.getPairedCard(),null); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java index 18da4e3e0c..62933dd442 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java @@ -1,11 +1,11 @@ package org.mage.test.cards.conditional; -import junit.framework.Assert; import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.LifelinkAbility; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java index f126ce9a04..722e6b8e82 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java @@ -1,10 +1,10 @@ package org.mage.test.cards.conditional.twofaced; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.filter.Filter; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java index afb2f92feb..75a884fc28 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java @@ -27,10 +27,10 @@ */ package org.mage.test.cards.copy; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java index d5a579a336..4beda08367 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java @@ -1,11 +1,10 @@ package org.mage.test.cards.copy; - -import junit.framework.Assert; import mage.constants.CardType; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -54,8 +53,8 @@ public class ProgenitorMimicTest extends CardTestPlayerBase { } } - Assert.assertTrue("Only one non token permanent ",nonTokens == 1); - Assert.assertTrue("Only one token permanent ",tokens == 1); + Assert.assertEquals("Only one non token permanent ",1, nonTokens); + Assert.assertEquals("Only one token permanent ",1, tokens); } // /** diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java index 63b7548b62..aff671071d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java @@ -1,9 +1,9 @@ package org.mage.test.cards.filters; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java index 630437381b..b668eaa019 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java @@ -1,8 +1,8 @@ package org.mage.test.cards.single; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -27,7 +27,7 @@ public class ArchangelsLightTest extends CardTestPlayerBase { assertLife(playerB, 20); assertGraveyardCount(playerA, 1); assertGraveyardCount(playerA, "Archangel's Light", 1); - Assert.assertEquals(currentGame.getPlayer(playerA.getId()).getLibrary().size(), 77); + Assert.assertEquals(77, currentGame.getPlayer(playerA.getId()).getLibrary().size()); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java index 1a318dfb3c..c94e0b4da5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java @@ -2,6 +2,7 @@ package org.mage.test.cards.single; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; +import mage.abilities.Ability; import mage.abilities.keyword.LifelinkAbility; import mage.constants.PhaseStep; import mage.constants.Zone; @@ -51,7 +52,7 @@ public class HomicidalSeclusionTest extends CardTestPlayerBase { assertPowerToughness(playerA, "Horned Turtle", 4, 5, Filter.ComparisonScope.All); - Abilities abilities = new AbilitiesImpl(); + Abilities abilities = new AbilitiesImpl<>(); abilities.add(LifelinkAbility.getInstance()); assertAbilities(playerA, "Horned Turtle", abilities); } @@ -95,7 +96,7 @@ public class HomicidalSeclusionTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Elite Vanguard", 0); assertPowerToughness(playerA, "Air Elemental", 7, 5, Filter.ComparisonScope.All); - Abilities abilities = new AbilitiesImpl(); + Abilities abilities = new AbilitiesImpl<>(); abilities.add(LifelinkAbility.getInstance()); assertAbilities(playerA, "Air Elemental", abilities); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java index f42414c955..c22897c8ae 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java @@ -1,8 +1,8 @@ package org.mage.test.cards.targets.attacking; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java index 89e7a0caff..0ac07bd9a8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java @@ -6,9 +6,9 @@ package org.mage.test.cards.triggers; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/MephidrossVampireTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/MephidrossVampireTest.java index 17bc1772f8..19318e7f96 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/MephidrossVampireTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/MephidrossVampireTest.java @@ -27,9 +27,9 @@ */ package org.mage.test.cards.triggers; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; 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 index 3acc3d81cf..379b1debbd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java @@ -1,10 +1,11 @@ package org.mage.test.combat; -import junit.framework.Assert; + import mage.constants.PhaseStep; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -51,7 +52,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { assertLife(playerB, 20); Permanent crawWurm = getPermanent("Craw Wurm", playerB.getId()); - Assert.assertTrue("Should be tapped because of being blocked by Wall of Frost", crawWurm.isTapped()); + Assert.assertEquals("Should be tapped because of being blocked by Wall of Frost", true, crawWurm.isTapped()); } /** diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java index d1e7be80dc..a668c46beb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java @@ -1,9 +1,9 @@ package org.mage.test.combat; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java index 68d646ae40..cc4376a88e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java @@ -1,10 +1,11 @@ package org.mage.test.combat; -import junit.framework.Assert; + import mage.constants.PhaseStep; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -26,8 +27,8 @@ public class DamageDistributionTest extends CardTestPlayerBase { execute(); Permanent instigator = getPermanent("Warren Instigator", playerA.getId()); - Assert.assertNotNull(instigator); - Assert.assertTrue("Computer didn't attacked with Warren Instigator", instigator.isTapped()); + Assert.assertNotEquals(null, instigator); + Assert.assertEquals("Computer didn't attacked with Warren Instigator", true, instigator.isTapped()); // should block and die assertPermanentCount(playerB, "Merfolk Looter", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/FlyersCantBeBlockedTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/FlyersCantBeBlockedTest.java index 48860f7ae0..4d8c93cca4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/FlyersCantBeBlockedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/FlyersCantBeBlockedTest.java @@ -28,10 +28,10 @@ package org.mage.test.combat; -import junit.framework.Assert; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.permanent.Permanent; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; diff --git a/Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java b/Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java index aea37ae344..af2eac6e4a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java @@ -82,7 +82,7 @@ public class ManaUtilTest extends CardTestPlayerBase { HashMap useableAbilities = getManaAbilities(card); Assert.assertEquals(expected1, useableAbilities.size()); - useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap)useableAbilities); + useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap)useableAbilities); Assert.assertEquals(expected2, useableAbilities.size()); } @@ -109,7 +109,7 @@ public class ManaUtilTest extends CardTestPlayerBase { HashMap useableAbilities = getManaAbilities(card); Assert.assertEquals(expected1, useableAbilities.size()); - useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap)useableAbilities); + useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap)useableAbilities); Assert.assertEquals(1, useableAbilities.size()); ManaAbility ability = useableAbilities.values().iterator().next(); Assert.assertTrue("Wrong mana ability has been chosen", expectedChosen.isInstance(ability)); diff --git a/Mage/pom.xml b/Mage/pom.xml index 54fd4e53aa..169b4be24c 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -24,7 +24,7 @@ com.h2database h2 - 1.4.178 + 1.4.185 runtime diff --git a/pom.xml b/pom.xml index 2b06250f53..e09b5420c4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + 3.2 1.7 1.7 @@ -24,14 +24,14 @@ maven-resources-plugin - 2.5 + 2.7 - UTF-8 + UTF-8 maven-jar-plugin - 2.4 + 2.5 @@ -85,13 +85,18 @@ junit junit - 4.11 + 4.12 log4j log4j 1.2.17 + + org.slf4j + slf4j-log4j12 + 1.7.10 +