From d25bca748d908f12e4c69527de63ef51aa0f275a Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 23 Jan 2019 19:15:03 +0400 Subject: [PATCH] Fixed Arrays.asList code --- .../src/mage/cards/c/CryptOfTheEternals.java | 3 ++- .../mage/test/serverside/PlayGameTest.java | 2 +- .../test/serverside/TestPlayRandomGame.java | 2 +- .../mage/test/sets/BoosterGenerationTest.java | 22 +++++++++---------- .../org/mage/test/utils/DeckBuilderTest.java | 2 +- .../java/mage/cards/decks/Constructed.java | 8 +++---- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java b/Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java index 8dae5457187..6c49acb28b1 100644 --- a/Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java +++ b/Mage.Sets/src/mage/cards/c/CryptOfTheEternals.java @@ -12,6 +12,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.UUID; @@ -28,7 +29,7 @@ public final class CryptOfTheEternals extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {T}: Add {U}, {B}, or {R}. - List list = Arrays.asList(Mana.BlueMana(1), Mana.BlackMana(1), Mana.RedMana(1)); + List list = new ArrayList<>(Arrays.asList(Mana.BlueMana(1), Mana.BlackMana(1), Mana.RedMana(1))); for (Mana m : list) { diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java index 1ac72226992..eba6b674384 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java @@ -29,7 +29,7 @@ import java.util.Locale; */ public class PlayGameTest extends MageTestBase { - private final static List colorChoices = Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu"); + private final static List colorChoices = new ArrayList<>(Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu")); @Ignore @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java b/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java index 7133fa183e2..c36b59a1081 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java @@ -28,7 +28,7 @@ import java.util.Locale; */ public class TestPlayRandomGame extends MageTestBase { - private final static List colorChoices = Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu"); + private final static List colorChoices = new ArrayList<>(Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu")); @Test @Ignore diff --git a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java index bfae2666eb2..e3347d4ce3b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java @@ -33,7 +33,7 @@ public class BoosterGenerationTest extends MageTestBase { CardScanner.scan(); } - private static final List basics = Arrays.asList("Plains", "Island", "Swamp", "Mountain", "Forest"); + private static final List basics = new ArrayList<>(Arrays.asList("Plains", "Island", "Swamp", "Mountain", "Forest")); private void checkOnePartnerBoost() { List booster = Battlebond.getInstance().createBooster(); @@ -64,11 +64,11 @@ public class BoosterGenerationTest extends MageTestBase { @Test public void testFateReforged() { - List tapland = Arrays.asList( + List tapland = new ArrayList<>(Arrays.asList( "Bloodfell Caves", "Blossoming Sands", "Dismal Backwater", "Jungle Hollow", "Rugged Highlands", - "Scoured Barrens", "Swiftwater Cliffs", "Thornwood Falls", "Tranquil Cove", "Wind-Scarred Crag"); - List fetchland = Arrays.asList( - "Bloodstained Mire", "Flooded Strand", "Polluted Delta", "Windswept Heath", "Wooded Foothills"); + "Scoured Barrens", "Swiftwater Cliffs", "Thornwood Falls", "Tranquil Cove", "Wind-Scarred Crag")); + List fetchland = new ArrayList<>(Arrays.asList( + "Bloodstained Mire", "Flooded Strand", "Polluted Delta", "Windswept Heath", "Wooded Foothills")); List booster = FateReforged.getInstance().createBooster(); assertTrue(str(booster), contains(booster, tapland, "FRF") || contains(booster, fetchland, "KTK") @@ -78,13 +78,13 @@ public class BoosterGenerationTest extends MageTestBase { @Test public void testMastersEditionII() { - List snowCoveredLand = Arrays.asList( + List snowCoveredLand = new ArrayList<>(Arrays.asList( "Snow-Covered Plains", "Snow-Covered Island", "Snow-Covered Swamp", "Snow-Covered Mountain", "Snow-Covered Forest" - ); + )); List booster = MastersEditionII.getInstance().createBooster(); assertTrue(str(booster), contains(booster, snowCoveredLand, "ME2")); assertFalse(str(booster), contains(booster, basics, null)); @@ -93,11 +93,11 @@ public class BoosterGenerationTest extends MageTestBase { @Test public void testMastersEditionIV_UrzaSpecialLandsList() { - List needUrzaList = Arrays.asList( + List needUrzaList = new ArrayList<>(Arrays.asList( "Urza's Mine", "Urza's Power Plant", "Urza's Tower" - ); + )); List setOrzaList = MastersEditionIV.getInstance().getSpecialLand(); Assert.assertEquals("Urza special lands must have 4 variation for each of 3 card", 3 * 4, setOrzaList.size()); @@ -117,11 +117,11 @@ public class BoosterGenerationTest extends MageTestBase { public void testMastersEditionIV_UrzaSpecialLandInBoosters() { // ME4 replace all basic lands with special (1 per booster) // https://mtg.gamepedia.com/Masters_Edition_IV - List urzaLand = Arrays.asList( + List urzaLand = new ArrayList<>(Arrays.asList( "Urza's Mine", "Urza's Power Plant", "Urza's Tower" - ); + )); for (int i = 1; i <= 5; i++) { List booster = MastersEditionIV.getInstance().createBooster(); diff --git a/Mage.Tests/src/test/java/org/mage/test/utils/DeckBuilderTest.java b/Mage.Tests/src/test/java/org/mage/test/utils/DeckBuilderTest.java index 2f7cf076724..8abdc5abc37 100644 --- a/Mage.Tests/src/test/java/org/mage/test/utils/DeckBuilderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/utils/DeckBuilderTest.java @@ -28,7 +28,7 @@ public class DeckBuilderTest { public void testAllArtifacts() { final List spellCardPool = new ArrayList<>(); final UUID owner = UUID.randomUUID(); - final List allowedColors = Arrays.asList(ColoredManaSymbol.U); + final List allowedColors = new ArrayList<>(Arrays.asList(ColoredManaSymbol.U)); final List setsToUse = new ArrayList<>(); final List landCardPool = null; final RateCallback rateCallback = new RateCallback() { diff --git a/Mage/src/main/java/mage/cards/decks/Constructed.java b/Mage/src/main/java/mage/cards/decks/Constructed.java index 4773b3972f4..15a5b9bcb1b 100644 --- a/Mage/src/main/java/mage/cards/decks/Constructed.java +++ b/Mage/src/main/java/mage/cards/decks/Constructed.java @@ -17,13 +17,13 @@ public class Constructed extends DeckValidator { private static final Logger logger = Logger.getLogger(DeckValidator.class); - protected static final List anyNumberCardsAllowed = Arrays.asList( + protected static final List anyNumberCardsAllowed = new ArrayList<>(Arrays.asList( "Relentless Rats", "Shadowborn Apostle", "Rat Colony", "Persistent Petitioners" - ); - protected static final List basicLandNames = Arrays.asList( + )); + protected static final List basicLandNames = new ArrayList<>(Arrays.asList( "Forest", "Island", "Mountain", "Swamp", "Plains", "Wastes", "Snow-Covered Forest", "Snow-Covered Island", "Snow-Covered Mountain", "Snow-Covered Swamp", "Snow-Covered Plains" - ); + )); protected List banned = new ArrayList<>(); protected List restricted = new ArrayList<>(); protected List setCodes = new ArrayList<>();