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

* Fixed the annoying SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on client start. Updated a lot of POM references. Fixed warnings of Test Project. Some changes to logging.

Browse source
This commit is contained in:
LevelX2 2015-02-20 13:58:13 +01:00
parent 48e08d94ce
commit 79e9312893
31 changed files with 94 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LevelUpAbilityTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ProteanHydraTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java
View file

@ -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;

7
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SoulbondKeywordTest.java
View file

@ -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<Ability> 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);
}
}

2
Mage.Tests/src/test/java/org/mage/test/cards/conditional/SejiriMerfolkTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/conditional/twofaced/TwoFacedCardEffectsTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java
View file

@ -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;

7
Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java
View file

@ -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);
}
// /**

2
Mage.Tests/src/test/java/org/mage/test/cards/filters/OneEyedScarecrowTest.java
View file

@ -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;

4
Mage.Tests/src/test/java/org/mage/test/cards/single/ArchangelsLightTest.java
View file

@ -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());
}

5
Mage.Tests/src/test/java/org/mage/test/cards/single/HomicidalSeclusionTest.java
View file

@ -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<Ability> 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<Ability> abilities = new AbilitiesImpl<>();
abilities.add(LifelinkAbility.getInstance());
assertAbilities(playerA, "Air Elemental", abilities);
}

2
Mage.Tests/src/test/java/org/mage/test/cards/targets/attacking/CondemnTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/triggers/BiovisionaryTest.java
View file

@ -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;

2
Mage.Tests/src/test/java/org/mage/test/cards/triggers/MephidrossVampireTest.java
View file

@ -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;

5
Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java
View file

@ -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());
}
/**

2
Mage.Tests/src/test/java/org/mage/test/combat/CantAttackOrBlockAloneTest.java
View file

@ -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;

7
Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java
View file

@ -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);

2
Mage.Tests/src/test/java/org/mage/test/combat/FlyersCantBeBlockedTest.java
View file

@ -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;

4
Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java
View file

@ -82,7 +82,7 @@ public class ManaUtilTest extends CardTestPlayerBase {
HashMap<UUID, ManaAbility> useableAbilities = getManaAbilities(card);
Assert.assertEquals(expected1, useableAbilities.size());
useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap)useableAbilities);
useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap<UUID, ManaAbility>)useableAbilities);
Assert.assertEquals(expected2, useableAbilities.size());
}
@ -109,7 +109,7 @@ public class ManaUtilTest extends CardTestPlayerBase {
HashMap<UUID, ManaAbility> useableAbilities = getManaAbilities(card);
Assert.assertEquals(expected1, useableAbilities.size());
useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap)useableAbilities);
useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap<UUID, ManaAbility>)useableAbilities);
Assert.assertEquals(1, useableAbilities.size());
ManaAbility ability = useableAbilities.values().iterator().next();
Assert.assertTrue("Wrong mana ability has been chosen", expectedChosen.isInstance(ability));