From 329f7fd609e0a9532239ac1cacb71d66c860c31f Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 26 Jun 2020 18:58:13 +0400 Subject: [PATCH] Little improves for tests --- .../{abilitywords => keywords}/ConvergeTest.java | 4 +--- .../{abilitywords => keywords}/DomainTest.java | 4 +--- .../{abilitywords => keywords}/RevoltTest.java | 4 +--- .../serverside/base/impl/CardTestPlayerAPIImpl.java | 5 +++-- .../abilities/effects/ContinuousEffectsList.java | 12 +++++++++--- 5 files changed, 15 insertions(+), 14 deletions(-) rename Mage.Tests/src/test/java/org/mage/test/cards/abilities/{abilitywords => keywords}/ConvergeTest.java (98%) rename Mage.Tests/src/test/java/org/mage/test/cards/abilities/{abilitywords => keywords}/DomainTest.java (96%) rename Mage.Tests/src/test/java/org/mage/test/cards/abilities/{abilitywords => keywords}/RevoltTest.java (97%) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/ConvergeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvergeTest.java similarity index 98% rename from Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/ConvergeTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvergeTest.java index 5d79565a587..205da4bd24b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/ConvergeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvergeTest.java @@ -1,5 +1,4 @@ - -package org.mage.test.cards.abilities.abilitywords; +package org.mage.test.cards.abilities.keywords; import mage.constants.PhaseStep; import mage.constants.Zone; @@ -7,7 +6,6 @@ import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** - * * @author LevelX2 */ public class ConvergeTest extends CardTestPlayerBase { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/DomainTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DomainTest.java similarity index 96% rename from Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/DomainTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DomainTest.java index 5a795817084..81513456f3e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/DomainTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DomainTest.java @@ -1,5 +1,4 @@ - -package org.mage.test.cards.abilities.abilitywords; +package org.mage.test.cards.abilities.keywords; import mage.constants.PhaseStep; import mage.constants.Zone; @@ -7,7 +6,6 @@ import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** - * * @author LevelX2 */ public class DomainTest extends CardTestPlayerBase { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/RevoltTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RevoltTest.java similarity index 97% rename from Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/RevoltTest.java rename to Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RevoltTest.java index c25d6cad2d8..151446d6c3f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/abilitywords/RevoltTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RevoltTest.java @@ -1,5 +1,4 @@ - -package org.mage.test.cards.abilities.abilitywords; +package org.mage.test.cards.abilities.keywords; import mage.constants.PhaseStep; import mage.constants.Zone; @@ -7,7 +6,6 @@ import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** - * * @author LevelX2 */ public class RevoltTest extends CardTestPlayerBase { diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java index 97940fff69f..71ff178235f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java @@ -51,7 +51,8 @@ import java.util.stream.Collectors; */ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implements CardTestAPI { - private static final boolean FAST_SCAN_WITHOUT_DATABASE_CREATE = false; // DEBUG only, enable it to fast startup tests without database create + // DEBUG only, enable it to fast startup tests without database create (delete \db\ folder to force db recreate) + private static final boolean FAST_SCAN_WITHOUT_DATABASE_CREATE = false; public static final String ALIAS_PREFIX = "@"; // don't change -- it uses in user's tests public static final String CHECK_PARAM_DELIMETER = "#"; @@ -137,7 +138,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement public CardTestPlayerAPIImpl() { // load all cards to db from class list ArrayList errorsList = new ArrayList<>(); - if (FAST_SCAN_WITHOUT_DATABASE_CREATE) { + if (FAST_SCAN_WITHOUT_DATABASE_CREATE && CardRepository.instance.findCard("Mountain") != null) { CardScanner.scanned = true; } CardScanner.scan(errorsList); diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java index 6353df838a9..c3e2cd34293 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java @@ -223,14 +223,20 @@ public class ContinuousEffectsList extends ArrayList effectAbilityMap.clear(); } - public boolean contains(Effect effect) { + @Override + public boolean contains(Object object) { + if (object == null || !(object instanceof ContinuousEffect)) { + return false; + } + // search by id + ContinuousEffect need = (ContinuousEffect) object; for (Iterator iterator = this.iterator(); iterator.hasNext(); ) { T test = iterator.next(); - if (effect.getId().equals(test.getId())) { + if (need.equals(test)) { return true; } - if (effect.equals(test)) { + if (need.getId().equals(test.getId())) { return true; } }