External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5910 from magefree/set_lint

Browse source 
Fix various hints and warnings on many set & block classes (via Intel…
This commit is contained in:
LevelX2 2019-12-15 13:21:08 +01:00 • committed by GitHub
commit af9f2c93dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 93 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java
View file

@ -28,14 +28,14 @@ public class DeckValidatorTest extends MageTestBase {
int number;
public CardNameAmount(String setCode, int cardNumber, int number) {
CardNameAmount(String setCode, int cardNumber, int number) {
this.name = "";
this.setCode = setCode;
this.cardNumber = String.valueOf(cardNumber);
this.number = number;
}
public CardNameAmount(String name, int number) {
CardNameAmount(String name, int number) {
this.name = name;
this.number = number;
}
@ -48,11 +48,11 @@ public class DeckValidatorTest extends MageTestBase {
return number;
}
public String getSetCode() {
String getSetCode() {
return setCode;
}
public String getCardNumber() {
String getCardNumber() {
return cardNumber;
}
@ -359,6 +359,7 @@ public class DeckValidatorTest extends MageTestBase {
cardinfo = CardRepository.instance.findCard(cardNameAmount.getName());
}
for (int i = 0; i < cardNameAmount.getNumber(); i++) {
assert cardinfo != null;
deckToTest.getCards().add(cardinfo.getCard());
}
}
@ -372,6 +373,7 @@ public class DeckValidatorTest extends MageTestBase {
cardinfo = CardRepository.instance.findCard(cardNameAmount.getName());
}
for (int i = 0; i < cardNameAmount.getNumber(); i++) {
assert cardinfo != null;
deckToTest.getSideboard().add(cardinfo.getCard());
}
}

20
Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java
View file

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.keyword.PartnerWithAbility;
import mage.cards.Card;
@ -143,6 +144,15 @@ public class BoosterGenerationTest extends MageTestBase {
assertTrue(allCards.stream().anyMatch(card -> card.getCardType().contains(CardType.LAND) && card.getRarity().equals(Rarity.COMMON)));
}
@Test
public void testWarOfTheSpark_EveryBoosterContainsPlaneswalker() {
for (int i = 0; i < 10; i++) {
List<Card> booster = WarOfTheSpark.getInstance().createBooster();
// check that booster contains a planeswalker
assertTrue(booster.stream().anyMatch(MageObject::isPlaneswalker));
}
}
@Test
public void testDominaria_EveryBoosterContainsLegendaryCreature() {
for (int i = 0; i < 10; i++) {
@ -160,6 +170,14 @@ public class BoosterGenerationTest extends MageTestBase {
}
}
@Test
public void testModernHorizons_BoosterMustHaveOneSnowLand() {
for (int i = 0; i < 10; i++) {
List<Card> booster = ModernHorizons.getInstance().createBooster();
assertTrue("Modern Horizon's booster must contain 1 snow covered land", booster.stream().anyMatch(card -> card.isBasic() && card.getName().startsWith("Snow-Covered ")));
}
}
@Test
public void testMastersEditionII_BoosterMustHaveOneSnowLand() {
for (int i = 0; i < 10; i++) {
@ -171,7 +189,7 @@ public class BoosterGenerationTest extends MageTestBase {
@Test
public void testBattlebond_BoosterMustHaveOneLand() {
for (int i = 0; i < 10; i++) {
List<Card> booster = Coldsnap.getInstance().createBooster();
List<Card> booster = Battlebond.getInstance().createBooster();
assertTrue("battlebond's booster must contain 1 land", booster.stream().anyMatch(card -> card.isBasic() && card.isLand()));
}
}