From b5016693652deba8307c067f5dc9a39e392915b4 Mon Sep 17 00:00:00 2001 From: Alex Vasile <48962821+Alex-Vasile@users.noreply.github.com> Date: Sat, 20 Aug 2022 07:52:01 -0400 Subject: [PATCH] Removed all calls to assertAllCommandsUsed() and made it private since it will be automatically called --- .../test/AI/basic/AttackAndBlockByAITest.java | 13 -------- .../mage/test/AI/basic/CastCreaturesTest.java | 1 - .../mage/test/AI/basic/ChooseTargetTest.java | 2 -- .../test/AI/basic/CommanderCardScore.java | 1 - .../org/mage/test/AI/basic/CopyAITest.java | 8 ----- .../mage/test/AI/basic/ExileTargetTest.java | 1 - .../mage/test/AI/basic/GainControlAITest.java | 3 -- .../test/AI/basic/TargetAmountAITest.java | 2 -- .../AI/basic/TargetControllerChangeTest.java | 2 -- .../test/AI/basic/TargetPriorityTest.java | 11 ------- .../test/AI/basic/TargetRequiredTest.java | 4 --- .../AI/basic/TargetStackObjectByAITest.java | 3 -- .../AI/basic/TestFrameworkCanPlayAITest.java | 5 --- .../abilities/activated/ChaosWandTest.java | 1 - .../activated/LightningStormTest.java | 1 - .../abilities/activated/ReconfigureTest.java | 4 --- .../curses/CurseOfShallowGravesTest.java | 2 -- .../cards/abilities/curses/CursesTest.java | 1 - .../abilities/enters/AetherFigmentTest.java | 1 - .../abilities/enters/BronzehideLionTest.java | 2 -- .../abilities/enters/GatherSpecimensTest.java | 2 -- .../GisaGloriousResurrectorBlinkedTest.java | 2 -- .../keywords/AffinityForArtifactsTest.java | 1 - .../cards/abilities/keywords/AfflictTest.java | 4 --- .../cards/abilities/keywords/AmplifyTest.java | 4 --- .../abilities/keywords/AnnihilatorTest.java | 1 - .../cards/abilities/keywords/AssistTest.java | 7 ---- .../cards/abilities/keywords/AwakenTest.java | 2 -- .../cards/abilities/keywords/BestowTest.java | 15 --------- .../cards/abilities/keywords/BlitzTest.java | 5 --- .../cards/abilities/keywords/BolsterTest.java | 4 --- .../cards/abilities/keywords/BuybackTest.java | 3 -- .../abilities/keywords/CompleatedTest.java | 2 -- .../cards/abilities/keywords/ConniveTest.java | 5 --- .../abilities/keywords/ConspireTest.java | 5 --- .../cards/abilities/keywords/ConvokeTest.java | 16 --------- .../cards/abilities/keywords/CrewTest.java | 7 ---- .../keywords/CumulativeUpkeepTest.java | 4 --- .../abilities/keywords/DayNightTest.java | 15 --------- .../cards/abilities/keywords/DecayedTest.java | 2 -- .../abilities/keywords/DeliriumTest.java | 4 --- .../cards/abilities/keywords/DelveTest.java | 4 --- .../cards/abilities/keywords/DisturbTest.java | 7 ---- .../cards/abilities/keywords/EchoTest.java | 1 - .../cards/abilities/keywords/EntwineTest.java | 6 ---- .../cards/abilities/keywords/EpicTest.java | 2 -- .../cards/abilities/keywords/EvolveTest.java | 1 - .../abilities/keywords/FlashbackTest.java | 2 -- .../abilities/keywords/ForetellTest.java | 6 +--- .../cards/abilities/keywords/GoadTest.java | 8 ----- .../abilities/keywords/HexproofTest.java | 6 ---- .../abilities/keywords/HideawayTest.java | 6 ---- .../abilities/keywords/ImproviseTest.java | 3 -- .../cards/abilities/keywords/KickerTest.java | 21 ------------ .../KickerWithAnyNumberModesAbilityTest.java | 5 --- .../keywords/KickerWithFlashbackTest.java | 3 -- .../cards/abilities/keywords/MadnessTest.java | 4 --- .../abilities/keywords/ManifestTest.java | 15 +-------- .../cards/abilities/keywords/MeldTest.java | 1 - .../cards/abilities/keywords/ModularTest.java | 1 - .../cards/abilities/keywords/MorphTest.java | 12 ------- .../abilities/keywords/OfferingTest.java | 3 -- .../abilities/keywords/OverloadTest.java | 4 --- .../cards/abilities/keywords/ProwlTest.java | 2 -- .../cards/abilities/keywords/ReboundTest.java | 3 +- .../abilities/keywords/ReplicateTest.java | 2 -- .../cards/abilities/keywords/RiotTest.java | 7 ---- .../cards/abilities/keywords/SupportTest.java | 1 - .../cards/abilities/keywords/SuspendTest.java | 4 --- .../abilities/keywords/TransformTest.java | 4 --- .../cards/abilities/keywords/WardTest.java | 1 - .../oneshot/ConditionalOneShotEffectTest.java | 6 ++-- .../AddingCountersToPermanentsTest.java | 1 - .../counterspell/CounterspellTest.java | 6 ---- .../counterspell/DisruptingShoalTest.java | 6 ---- .../oneshot/counterspell/ForceOfWillTest.java | 1 - .../counterspell/NotOfThisWorldTest.java | 1 - .../destroy/UnlicensedDisintegrationTest.java | 12 +++---- .../oneshot/destroy/WrathOfGodTest.java | 1 - .../other/ChorusOfTheConclaveTest.java | 2 -- .../other/FeatherTheRedeemedTest.java | 3 -- .../abilities/other/GainAbilitiesTest.java | 2 -- .../GainMenaceAbilityAsSingletonTest.java | 1 - .../abilities/other/ImpelledGiantTest.java | 2 -- .../abilities/other/MycosynthGolemTest.java | 1 - .../cards/abilities/other/OathOfKayaTest.java | 3 -- .../abilities/other/PaupersCageTest.java | 4 --- .../other/RielleTheEverwiseTest.java | 3 -- .../cards/asthough/AsThoughManaAndAITest.java | 1 - .../asthough/DidNotHaveHexproofTest.java | 1 - .../cards/asthough/IntetTheDreamerTest.java | 1 - .../asthough/PlayFromNonHandZoneTest.java | 8 ----- .../asthough/PlayLandsFromGraveyardTest.java | 1 - .../asthough/PlayTopCardFromLibraryTest.java | 9 ----- .../cards/asthough/SpendOtherManaTest.java | 5 --- .../conditional/ConditionalAsThoughTest.java | 2 -- .../cards/conditional/FaceOfDivinityTest.java | 1 - .../conditional/LegendarySorceryTest.java | 1 - .../conditional/ManaWasSpentToCastTest.java | 10 ------ .../twofaced/TwoFacedCardEffectsTest.java | 1 - .../continuous/AngelOfJubilationTest.java | 7 +--- .../cards/continuous/AuratouchedMageTest.java | 1 - .../test/cards/continuous/ChangelingTest.java | 2 -- ...manderAsIndomitableCreativityCastTest.java | 2 -- .../cards/continuous/CommandersCastTest.java | 16 --------- .../continuous/CommandersGameRestartTest.java | 2 -- .../ConcurrentModificationExceptionTest.java | 1 - .../ConditionalCostModificationTest.java | 5 --- .../continuous/ConditionalPreventionTest.java | 9 ----- .../continuous/DependentEffectsTest.java | 3 -- .../EndOfTurnMultiOpponentsTest.java | 4 --- .../continuous/EndOfTurnOneOpponentTest.java | 3 -- .../GainAbilityDependenciesTest.java | 2 -- .../continuous/GideonBlackbladeTest.java | 1 - ...GideonJuraAndRowanKenrithNextTurnTest.java | 2 -- .../continuous/GoblinBushwhackerTest.java | 1 - .../cards/continuous/IrencragFeatTest.java | 5 --- .../LandTypeChangingEffectsTest.java | 7 ---- .../test/cards/continuous/LayerTests.java | 3 -- .../cards/continuous/MartyrsOfKorlisTest.java | 1 - .../continuous/MerfolkTricksterTest.java | 2 -- .../continuous/OracleEnVecNextTurnTest.java | 1 - .../cards/continuous/PaintersServantTest.java | 3 +- .../continuous/PlayerLeavesGameTest.java | 5 --- .../cards/continuous/PraetorsGraspTest.java | 1 - .../continuous/PsychicIntrusionTest.java | 1 - .../continuous/ShinenOfLifesRoarTest.java | 1 - .../cards/continuous/SplitSecondTest.java | 2 -- .../SubTypeChangingEffectsTest.java | 1 - .../TappedForManaFromMultipleEffects.java | 8 ----- .../continuous/UnboundFlourishingTest.java | 8 ----- .../continuous/UntilNextEndStepTest.java | 1 - .../VraskaTheUnseenNextTurnTest.java | 1 - .../continuous/WallOfDustNextTurnTest.java | 1 - .../cards/control/ExchangeControlTest.java | 2 -- .../control/GainControlDiedCastAgainTest.java | 1 - .../GainControlOfOwnedCreaturesTest.java | 4 --- .../TakeControlWhileSearchingLibraryTest.java | 6 ---- .../mage/test/cards/copy/AlteredEgoTest.java | 2 -- .../cards/copy/CleverImpersonatorTest.java | 1 - .../org/mage/test/cards/copy/CloneTest.java | 4 +-- .../test/cards/copy/CopyEnchantmentTest.java | 1 - .../cards/copy/CopyPermanentSpellTest.java | 11 ------- .../mage/test/cards/copy/CopySpellTest.java | 11 ------- .../cards/copy/EssenceOfTheWildCopyTest.java | 5 --- .../test/cards/copy/EssenceOfTheWildTest.java | 3 -- .../cards/copy/FeldonOfTheThirdPathTest.java | 2 -- .../test/cards/copy/IdentityThiefTest.java | 1 - .../mage/test/cards/copy/MimicVatTest.java | 1 - .../test/cards/copy/PhantasmalImageTest.java | 4 --- .../cards/copy/SharuumTheHegemonTest.java | 1 - .../mage/test/cards/copy/SparkDoubleTest.java | 8 ----- .../cards/copy/VolrathsShapshifterTest.java | 3 -- .../RevealedOrControlledDragonTest.java | 9 ----- .../cost/adventure/AdventureCardsTest.java | 32 ------------------ .../cost/alternate/BolassCitadelTest.java | 6 ---- ...CastFromHandWithoutPayingManaCostTest.java | 8 +---- .../UseAlternateSourceCostsTest.java | 12 ++----- .../ModalDoubleFacesCardsInCommanderTest.java | 2 -- .../ModalDoubleFacesCardsTest.java | 33 ------------------- .../modification/CostModificationTest.java | 8 ----- .../modification/CostReduceForEachTest.java | 11 +------ .../CostReduceWithConditionTest.java | 3 -- .../modification/FerventChampionTest.java | 2 -- .../KaradorGhostChieftainTest.java | 5 --- .../MonohybridCostReduceTest.java | 1 - .../modification/MonohybridManaPayTest.java | 4 --- .../PayDelveFromCommandZoneTest.java | 1 - .../CastSplitCardsFromOtherZonesTest.java | 4 --- .../cards/cost/splitcards/SplitCardsTest.java | 1 - .../test/cards/damage/ExcessDamageTest.java | 6 ---- .../mage/test/cards/digital/ConjureTest.java | 3 -- .../org/mage/test/cards/digital/SeekTest.java | 1 - .../mage/test/cards/dungeons/DungeonTest.java | 14 -------- .../cards/dynamicvalue/PartyCountTest.java | 10 ------ .../test/cards/dynamicvalue/SweepTest.java | 1 - .../cards/enchantments/AnimateDeadTest.java | 2 -- .../test/cards/enchantments/ClassTest.java | 6 ---- .../cards/enchantments/NestOfScarabsTest.java | 1 - .../cards/enchantments/OathOfLiegesTest.java | 6 ---- .../test/cards/enchantments/SagaTest.java | 6 ---- .../enchantments/StarfieldOfNyxTest.java | 3 -- .../cards/facedown/BaneAlleyBrokerTest.java | 2 -- .../test/cards/facedown/GrimHaruspexTest.java | 2 -- .../cards/facedown/PrimordialMistTest.java | 2 -- .../mage/test/cards/facedown/TriggerTest.java | 4 --- .../cards/flip/SasayaOrochiAscendantTest.java | 4 +-- .../test/cards/flipcoin/FlipCoinTest.java | 3 -- .../test/cards/mana/DoublingCubeTest.java | 10 ++---- .../test/cards/mana/ExtraplanarLensTest.java | 2 -- .../mage/test/cards/mana/GaeasGradleTest.java | 2 -- .../mage/test/cards/mana/HarvestMageTest.java | 5 +-- .../mage/test/cards/mana/ManaPoolTest.java | 12 ------- ...TimesUsableActivatedManaAbilitiesTest.java | 4 +-- .../mana/NonTappingManaAbilitiesTest.java | 29 ++-------------- .../cards/mana/RosheenMeandererManaXTest.java | 6 ---- .../test/cards/mana/SylvokExplorerTest.java | 2 -- .../cards/mana/TappedForManaRelatedTest.java | 19 +---------- .../mana/conditional/ConditionalManaTest.java | 8 ----- .../conditional/CrypticTrilobiteTest.java | 7 +--- .../mana/conditional/TitansNestTest.java | 3 +- .../mana/phyrexian/PhyrexianManaTest.java | 10 ++---- .../mage/test/cards/modal/ChooseOneTest.java | 1 - .../mage/test/cards/modal/OneOrMoreTest.java | 2 -- .../cards/planes/UndercityReachesTest.java | 2 -- .../test/cards/planeswalker/GideonTest.java | 3 -- .../test/cards/planeswalker/LilianaTest.java | 1 - .../NissaStewardOfElementsTest.java | 1 - .../prevention/PreventAllDamageTest.java | 6 ---- .../replacement/AcademyManufactorTest.java | 4 --- .../ChatterfangSquirrelGeneralTest.java | 3 -- .../cards/replacement/DoublingSeasonTest.java | 5 --- .../cards/replacement/RegenerateTest.java | 9 ----- .../replacement/SanctifierEnVecTest.java | 4 --- .../cards/replacement/ShieldCounterTest.java | 4 --- .../prevent/DeflectingPalmTest.java | 2 -- .../replacement/prevent/ForcefieldTest.java | 1 - .../redirect/PalisadeGiantTest.java | 1 - .../BecomeBlockTriggersAITest.java | 2 -- .../BecomeBlockTriggersMonteCarloAITest.java | 1 - .../test/cards/restriction/ArrestTest.java | 1 - .../cards/restriction/CantAttackTest.java | 8 ----- .../CantUseActivatedAbilitiesTest.java | 5 ++- .../cards/restriction/MeddlingMageTest.java | 9 ++--- .../test/cards/rolldice/RollDiceTest.java | 17 ---------- .../mage/test/cards/rules/CantCastTest.java | 3 -- .../cards/rules/MeliraSylvokOutcastTest.java | 1 - .../rules/WorldEnchantmentsRuleTest.java | 4 --- .../single/afc/BeltOfGiantStrengthTest.java | 3 -- .../cards/single/afc/ShareTheSpoilsTest.java | 23 ------------- .../single/afr/BruenorBattlehammerTest.java | 2 -- .../cards/single/afr/PortableHoleTest.java | 2 -- .../cards/single/afr/PowerWordKillTest.java | 1 - .../single/afr/ProsperousInnkeeperTest.java | 2 -- .../cards/single/afr/TheTarrasqueTest.java | 3 -- .../cards/single/afr/VorpalSwordTest.java | 2 -- .../afr/VrondissRageOfAncientsTest.java | 1 - .../single/afr/XanatharGuildKingpinTest.java | 1 - .../akh/ApproachOfTheSecondSunTest.java | 10 ------ .../single/akh/BontuTheGlorifiedTest.java | 1 - .../cards/single/akh/DecimatorBeetleTest.java | 1 - .../akh/HapatraVizierOfPoisonsTest.java | 1 - .../cards/single/arb/SenTripletsTest.java | 4 --- .../cards/single/avr/CavernOfSoulsTest.java | 1 - .../cards/single/avr/ExquisiteBloodTest.java | 4 --- .../avr/GiselaBladeOfGoldnightTest.java | 8 ----- .../cards/single/bfz/ConduitOfRuinTest.java | 2 -- .../single/bok/ShireiShizosCaretakerTest.java | 3 -- .../single/c13/MarathWillOfTheWildTest.java | 1 - .../single/c17/KessDissidentMageTest.java | 4 --- .../cards/single/c17/TheUrDragonTest.java | 3 +- .../cards/single/c18/AminatousAuguryTest.java | 2 -- .../test/cards/single/c18/GeodeGolemTest.java | 3 -- .../test/cards/single/c19/AeonEngineTest.java | 9 ++--- .../single/c19/ElshaOfTheInfiniteTest.java | 1 - .../cards/single/c20/EonFrolickerTest.java | 1 - .../single/c20/PakoArcaneRetrieverTest.java | 8 ++--- .../cards/single/c20/TwinningStaffTest.java | 3 -- .../single/chk/HorobiDeathsWailTest.java | 1 - .../chk/TatsumasaTheDragonsFangTest.java | 1 - .../test/cards/single/chk/UbaMaskTest.java | 2 -- .../cards/single/cmd/AcornCatapultTest.java | 4 --- .../single/cmr/AkromaVisionOfIxidorTest.java | 1 - .../cards/single/cmr/AkromasWillTest.java | 2 -- .../single/cmr/ArchelosLagoonMysticTest.java | 1 - .../single/cmr/ArmixFiligreeThrasherTest.java | 1 - .../cmr/EligethCrossroadsAugurTest.java | 1 - .../cmr/GilanraCallerOfWirewoodTest.java | 4 --- .../cards/single/cmr/HansErikssonTest.java | 3 -- .../cards/single/cmr/HellkiteCourserTest.java | 1 - .../cards/single/cmr/JeweledLotusTest.java | 2 -- .../single/cmr/KrarkTheThumblessTest.java | 1 - .../single/cmr/ProfaneTransfusionTest.java | 4 --- .../single/cmr/PromiseOfTomorrowTest.java | 3 -- .../cards/single/cmr/RakshasaDebaserTest.java | 1 - .../single/cmr/SphinxOfTheSecondSunTest.java | 2 -- .../cards/single/cns/PalaceJailerTest.java | 4 --- .../single/dka/FiendOfTheShadowsTest.java | 1 - .../single/dom/SimpleDominariaCards.java | 2 -- .../test/cards/single/dst/DemonsHornTest.java | 4 --- .../test/cards/single/dtk/LivingLoreTest.java | 1 - .../cards/single/eld/BarteredCowTest.java | 6 ---- .../cards/single/eld/OnceUponATimeTest.java | 4 --- .../cards/single/eld/RobberOfTheRichTest.java | 2 -- .../single/eld/TorbranThaneOfRedFellTest.java | 3 -- .../single/emn/EmrakulThePromisedEndTest.java | 5 --- .../cards/single/eve/HotheadedGiantTest.java | 2 -- .../test/cards/single/eve/SoulReapTest.java | 2 -- .../cards/single/fdn/RiteOfPassageTest.java | 2 -- .../single/fut/MuragandaPetroglyphsTest.java | 10 ------ .../cards/single/fut/YixlidJailerTest.java | 8 ----- .../cards/single/gnt/MilitantAngelTest.java | 1 - .../single/grn/BeamsplitterMageTest.java | 2 -- .../cards/single/grn/PeltCollectorTest.java | 18 ---------- .../single/grn/ThousandYearStormTest.java | 9 ----- .../single/hou/AbandonedSarcophagusTest.java | 7 ---- .../single/hou/TormentOfHailfireTest.java | 2 -- .../cards/single/ice/ZursWeirdingTest.java | 2 -- .../single/iko/GenesisUltimatumTest.java | 1 - .../single/iko/KinnanBonderProdigyTest.java | 2 -- .../single/iko/OboshThePreypiercerTest.java | 1 - .../cards/single/iko/SkycatSovereignTest.java | 10 ++---- .../test/cards/single/iko/TheOzolithTest.java | 6 ---- .../single/iko/UnpredictableCycloneTest.java | 5 --- .../iko/ZilorthaStrengthIncarnateTest.java | 8 ----- .../single/iko/ZirdaTheDawnwakerTest.java | 4 --- .../cards/single/inv/SpreadingPlagueTest.java | 1 - .../cards/single/inv/TravelersCloakTest.java | 1 - .../test/cards/single/jou/DeicideTest.java | 1 - .../single/jou/KruphixGodOfHorizonsTest.java | 2 -- .../single/khc/EtherealValkyrieTest.java | 13 -------- .../cards/single/khm/CripplingFearTest.java | 3 -- .../single/khm/DraugrNecromancerTest.java | 11 ------- .../cards/single/khm/DreamDevourerTest.java | 5 --- .../single/khm/FrostpyreArcanistTest.java | 1 - .../single/khm/KarfellHarbingerTest.java | 2 -- .../single/khm/MoritteOfTheFrostTest.java | 3 -- .../cards/single/khm/RuneOfFlightTest.java | 2 -- .../test/cards/single/khm/TyvarKellTest.java | 2 -- .../cards/single/khm/ValkiGodOfLiesTest.java | 1 - .../khm/VorinclexMonstrousRaiderTest.java | 7 ---- .../cards/single/ktk/GhostfireBladeTest.java | 1 - .../test/cards/single/lea/BalanceTest.java | 1 - .../cards/single/lrw/AquitectsWillTest.java | 3 -- .../single/lrw/AshlingThePilgrimTest.java | 9 ----- .../cards/single/m11/InfernoTitanTest.java | 3 -- .../cards/single/m11/NecroticPlagueTest.java | 2 -- .../test/cards/single/m12/AegisAngelTest.java | 5 --- .../single/m14/PyromancersGauntletTest.java | 3 -- .../test/cards/single/m20/AetherGustTest.java | 2 -- .../single/m20/EmbodimentOfAgoniesTest.java | 5 --- .../single/m20/RepeatedReverberationTest.java | 4 --- .../cards/single/m21/AdherentOfHopeTest.java | 3 -- .../cards/single/m21/AlchemistsGiftTest.java | 2 -- .../single/m21/AlpineHoundmasterTest.java | 4 --- .../single/m21/AngelicAscensionTest.java | 2 -- .../cards/single/m21/AnimalSanctuaryTest.java | 6 ---- .../single/m21/AnointedChoristerTest.java | 1 - .../single/m21/ArchfiendsVesselTest.java | 3 -- .../single/m21/AvenGagglemasterTest.java | 1 - .../test/cards/single/m21/BadDealTest.java | 1 - .../m21/BarrinTolarianArchmageTest.java | 3 -- .../single/m21/BasriDevotedPaladinTest.java | 3 -- .../test/cards/single/m21/BasriKetTest.java | 3 -- .../cards/single/m21/BasrisAcolyteTest.java | 1 - .../cards/single/m21/BasrisAegisTest.java | 1 - .../single/m21/BasrisLieutenantTest.java | 3 -- .../single/m21/BasrisSolidarityTest.java | 1 - .../test/cards/single/m21/BoltHoundTest.java | 1 - .../cards/single/m21/BonePitBruteTest.java | 1 - .../cards/single/m21/BrashTaunterTest.java | 3 -- .../cards/single/m21/BurlfistOakTest.java | 1 - .../test/cards/single/m21/BurnBrightTest.java | 1 - .../cards/single/m21/CagedZombieTest.java | 1 - .../test/cards/single/m21/CancelTest.java | 1 - .../cards/single/m21/CanopyStalkerTest.java | 2 -- .../cards/single/m21/CaptureSphereTest.java | 1 - .../cards/single/m21/CarrionGrubTest.java | 2 -- .../single/m21/CelestialEnforcerTest.java | 1 - .../single/m21/ChandrasIncineratorTest.java | 1 - .../cards/single/m21/ChandrasMagmuttTest.java | 2 -- .../single/m21/ChandrasPyrelingTest.java | 1 - .../cards/single/m21/ChromaticOrreryTest.java | 2 -- .../single/m21/ChromeReplicatorTest.java | 3 -- .../cards/single/m21/ConclaveMentorTest.java | 2 -- .../single/m21/ConspicuousSnoopTest.java | 3 -- .../single/m21/ContainmentPriestTest.java | 1 - .../cards/single/m21/CrashThroughTest.java | 1 - .../cards/single/m21/DaybreakChargerTest.java | 1 - .../single/m21/DeathbloomThallidTest.java | 1 - .../single/m21/DireFleetWarmongerTest.java | 1 - .../cards/single/m21/DiscontinuityTest.java | 1 - .../cards/single/m21/DoubleVisionTest.java | 1 - .../mage/test/cards/single/m21/DubTest.java | 1 - .../cards/single/m21/ElderGargarothTest.java | 3 -- .../test/cards/single/m21/EliminateTest.java | 2 -- .../cards/single/m21/EnthrallingHoldTest.java | 2 -- .../single/m21/ExperimentalOverloadTest.java | 1 - .../cards/single/m21/FalconerAdeptTest.java | 1 - .../single/m21/FieryEmancipationTest.java | 2 -- .../cards/single/m21/FinishingBlowTest.java | 2 -- .../single/m21/ForgottenSentinelTest.java | 1 - .../single/m21/FranticInventoryTest.java | 1 - .../cards/single/m21/FrostBreathTest.java | 1 - .../cards/single/m21/FungalRebirthTest.java | 1 - .../single/m21/HoodedBlightfangTest.java | 2 -- .../cards/single/m21/IdolOfEnduranceTest.java | 5 --- .../test/cards/single/mh1/LavaDartTest.java | 1 - .../single/mh2/DauthiVoidwalkerTest.java | 2 -- .../cards/single/mh2/GarthOneEyeTest.java | 6 ---- .../single/mh2/GristTheHungerTideTest.java | 3 -- .../single/mh2/ZabazTheGlimmerwaspTest.java | 2 -- .../cards/single/mmq/CallerOfTheHuntTest.java | 2 -- .../cards/single/mmq/MisdirectionTest.java | 4 --- .../single/mrd/ChaliceOfTheVoidTest.java | 2 -- .../single/ncc/JoleneThePlunderQueenTest.java | 4 --- .../cards/single/ncc/SmugglersShareTest.java | 6 ---- .../test/cards/single/neo/StoryweaveTest.java | 3 -- .../test/cards/single/nph/NornsAnnexTest.java | 1 - .../single/pc2/FracturedPowerstoneTest.java | 2 -- .../single/rix/ReleaseToTheWindTest.java | 2 -- .../cards/single/rna/PteramanderTest.java | 2 -- .../single/rtr/NivmagusElementalTest.java | 2 -- .../cards/single/scg/DecreeOfPainTest.java | 1 - .../single/snc/UnlicensedHearseTest.java | 2 -- .../test/cards/single/soi/GameTrailTest.java | 4 --- .../single/soi/LambholtPacifistTest.java | 1 - .../cards/single/som/NimDeathmantleTest.java | 2 -- .../cards/single/stx/BalefulMasteryTest.java | 5 --- .../cards/single/stx/DaemogothTitanTest.java | 2 -- .../single/stx/EmergentSequenceTest.java | 2 -- .../single/stx/PlumbTheForbiddenTest.java | 1 - .../single/stx/RadiantScrollwielderTest.java | 1 - .../single/stx/ShowOfConfidenceTest.java | 1 - .../test/cards/single/stx/StarPupilTest.java | 1 - .../cards/single/tmp/KnightOfDuskTest.java | 3 -- .../test/cards/single/tor/RadiateTest.java | 2 -- .../cards/single/tsp/GauntletOfPowerTest.java | 3 -- .../single/tsp/WeatherseedTotemTest.java | 2 -- .../cards/single/tsr/ShivanSandMageTest.java | 4 --- .../cards/single/ulg/GoblinWelderTest.java | 1 - .../test/cards/single/vis/DesertionTest.java | 1 - .../single/vow/SaviorOfOllenbockTest.java | 4 --- .../single/war/GodEternalKefnetTest.java | 2 -- .../single/war/MobilizedDistrictTest.java | 2 -- .../cards/single/xln/TreasureCoveTest.java | 1 - .../cards/single/zen/ArchiveTrapTest.java | 1 - .../cards/single/zen/BlazingTorchTest.java | 3 -- .../single/znr/AshayaSoulOfTheWildTest.java | 5 --- .../CastSplitCardsWithAsThoughManaTest.java | 3 -- ...astSplitCardsWithCostModificationTest.java | 9 ----- .../CastSplitCardsWithFlashbackTest.java | 4 --- .../split/CastSplitCardsWithFuseTest.java | 3 -- .../split/CastSplitCardsWithSpliceTest.java | 2 -- .../cards/targets/HexproofPlayerTest.java | 12 +++---- .../cards/targets/TargetMultiAmountTest.java | 4 --- .../cards/targets/TargetRestrictionsTest.java | 10 ++---- .../cards/triggers/AbilityOwnershipTest.java | 2 -- .../cards/triggers/DivineVisitationTest.java | 3 -- .../EnterLeaveBattlefieldExileTargetTest.java | 2 -- .../EntersTheBattlefieldTriggerTest.java | 1 - .../test/cards/triggers/GripOfChaosTest.java | 2 +- ...rDoomscourgeAndKithkinMourncallerTest.java | 3 -- .../cards/triggers/PollutedBondsTest.java | 2 -- .../triggers/RanarTheEverWatchfulTest.java | 4 +-- .../cards/triggers/SpellCastTriggerTest.java | 1 - .../test/cards/triggers/SpellskiteTest.java | 9 ----- .../cards/triggers/StormCauldronTest.java | 2 -- .../cards/triggers/StrictProctorTest.java | 6 ++-- .../cards/triggers/WoodlandChampionTest.java | 1 - .../cards/triggers/WorldgorgerDragonTest.java | 3 -- .../cards/triggers/ZadaHedronGrinderTest.java | 2 -- .../damage/SeraphAndSengirVampireTest.java | 3 +- .../triggers/damage/SyrCarahTheBoldTest.java | 2 -- .../cards/triggers/dies/AshenRiderTest.java | 2 -- .../cards/triggers/dies/BloodArtistTest.java | 4 --- .../cards/triggers/dies/BrainMaggotTest.java | 3 -- .../triggers/dies/FootlightFiendTest.java | 1 - .../triggers/dies/MurderousRiderTest.java | 2 -- .../triggers/dies/OmnathLocusOfRageTest.java | 3 -- .../cards/triggers/dies/ShowstopperTest.java | 3 -- .../triggers/dies/SilumgarScavengerTest.java | 1 - .../triggers/dies/TidehollowScullerTest.java | 2 -- .../dies/WhisperwoodElementalTest.java | 1 - .../triggers/dies/ZulaportCutthroatTest.java | 1 - .../triggers/events/UnequipEventTest.java | 3 +- .../watchers/HallOfTheBanditLordTest.java | 1 - ...hersFromDelayedTriggeredAbilitiesTest.java | 1 - .../test/combat/AttackPlaneswalkerTest.java | 1 - .../test/combat/LifelinkInCombatTest.java | 6 ---- .../duel/CastBGPartnerCommanderTest.java | 3 -- .../commander/duel/CastBRGCommanderTest.java | 4 --- .../commander/duel/CastCommanderTest.java | 4 --- .../commander/duel/CommanderAffinityTest.java | 5 --- .../duel/CommanderColorChangeTest.java | 4 +-- .../duel/MairsilThePretenderTest.java | 9 ++--- .../test/commander/duel/MythUnboundTest.java | 1 - .../test/commander/duel/OpalPalaceTest.java | 1 - .../duel/TeferiMageOfZhalfirTest.java | 3 -- .../YorvoLordOfGarenbrigOnCommandersTest.java | 2 -- .../piper/ThePrismaticPiperTest1.java | 1 - .../piper/ThePrismaticPiperTest2.java | 1 - .../piper/ThePrismaticPiperTest3.java | 1 - .../piper/ThePrismaticPiperTest5.java | 1 - .../piper/ThePrismaticPiperTest8.java | 1 - .../game/ends/PhageTheUntouchableTest.java | 2 -- .../test/multiplayer/AngelOfSerenityTest.java | 1 - .../test/multiplayer/BlatantThieveryTest.java | 2 -- .../multiplayer/PlayerLeftGameRange1Test.java | 3 -- .../PlayerLeftGameRangeAllTest.java | 2 -- .../org/mage/test/multiplayer/VotingTest.java | 13 -------- .../test/rollback/CopyAnthemEffectTest.java | 1 - .../test/rollback/DemonicCollusionTest.java | 2 -- .../mage/test/rollback/DemonicPactTest.java | 2 -- .../mage/test/rollback/StateValuesTest.java | 4 --- .../mage/test/serverside/CardIconsTest.java | 4 --- .../base/impl/CardTestPlayerAPIImpl.java | 2 +- .../abilities/ProtectionFromTypeTest.java | 1 - .../org/mage/test/testapi/TestAliases.java | 8 ----- .../test/testapi/WaitStackResolvedTest.java | 2 -- .../org/mage/test/turnmod/ExtraTurnsTest.java | 2 -- 501 files changed, 60 insertions(+), 1774 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/AttackAndBlockByAITest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/AttackAndBlockByAITest.java index e8495eb60b..e82babd313 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/AttackAndBlockByAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/AttackAndBlockByAITest.java @@ -24,7 +24,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2 - 2); @@ -39,7 +38,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2 - 2); @@ -54,7 +52,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2); @@ -69,7 +66,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2 - 2); @@ -82,7 +78,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 1); @@ -96,7 +91,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); // no attacks @@ -110,7 +104,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); // no attacks @@ -126,7 +119,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - ((15 - 1) * 2)); // one will be blocked @@ -143,7 +135,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - ((10 - 1) * 2)); // one will be blocked @@ -159,7 +150,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Goblin Brigand", 1); assertLife(playerA, 20); @@ -177,7 +167,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Goblin Brigand", 2); assertLife(playerA, 20); @@ -198,7 +187,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Arbor Elf", 1); assertLife(playerA, 20); @@ -214,7 +202,6 @@ public class AttackAndBlockByAITest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/CastCreaturesTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/CastCreaturesTest.java index 902af913aa..1d60e5b9c1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/CastCreaturesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/CastCreaturesTest.java @@ -196,7 +196,6 @@ public class CastCreaturesTest extends CardTestPlayerBaseAI { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Ammit Eternal", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java index 7f8608886c..5c54ef6cb4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/ChooseTargetTest.java @@ -26,7 +26,6 @@ public class ChooseTargetTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPermanentCount(playerB, "Silvercoat Lion", 1); @@ -49,7 +48,6 @@ public class ChooseTargetTest extends CardTestPlayerBase { //setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPermanentCount(playerB, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/CommanderCardScore.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/CommanderCardScore.java index 04749e0ba4..cc4396bc0c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/CommanderCardScore.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/CommanderCardScore.java @@ -22,6 +22,5 @@ public class CommanderCardScore extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java index ce1dbb67ca..061c89e8cb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/CopyAITest.java @@ -32,7 +32,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spectral Bears", 1); assertPermanentCount(playerB, "Spectral Bears", 1); @@ -55,7 +54,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spectral Bears", 2); assertPermanentCount(playerB, "Spectral Bears", 0); @@ -78,7 +76,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spectral Bears", 1); assertPermanentCount(playerB, "Spectral Bears", 1); @@ -102,7 +99,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spectral Bears", 1); assertExileCount("Spectral Bears", 1); @@ -126,7 +122,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spectral Bears", 1); assertExileCount("Spectral Bears", 1); @@ -150,7 +145,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spectral Bears", 1); assertExileCount("Spectral Bears", 1); @@ -175,7 +169,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); //setStrictChooseMode(true); // AI must choose execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spectral Bears", 1); assertExileCount("Spectral Bears", 1); @@ -200,7 +193,6 @@ public class CopyAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); //setStrictChooseMode(true); // AI must choose execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spectral Bears", 1); assertExileCount("Spectral Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/ExileTargetTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/ExileTargetTest.java index 1ac6cd24d8..cc02f597c4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/ExileTargetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/ExileTargetTest.java @@ -31,7 +31,6 @@ public class ExileTargetTest extends CardTestCommander4Players { //setStrictChooseMode(true); // disable strict mode to activate AI for choosing setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerC, "Balduvian Bears", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/GainControlAITest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/GainControlAITest.java index 4f0459bb04..1cff0a390e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/GainControlAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/GainControlAITest.java @@ -23,7 +23,6 @@ public class GainControlAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Island", 4); assertPermanentCount(playerA, "Swamp", 1); @@ -43,7 +42,6 @@ public class GainControlAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Island", 4); assertPermanentCount(playerA, "Swamp", 1); @@ -64,7 +62,6 @@ public class GainControlAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Island", 4); assertPermanentCount(playerA, "Swamp", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetAmountAITest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetAmountAITest.java index 09776653e3..ca5169e0ad 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetAmountAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetAmountAITest.java @@ -25,7 +25,6 @@ public class TargetAmountAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); //setStrictChooseMode(true); // ai must choose execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Balduvian Bears", 2 + 4, 2 + 4); // boost one creature (it's just a choose code, so can be different from simulation results) } @@ -45,7 +44,6 @@ public class TargetAmountAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Balduvian Bears", 2 + 1, 2 + 1); // boost each possible creatures assertPowerToughness(playerB, "Balduvian Bears", 2, 2); // no boost for enemy diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java index ddf989f028..397540b548 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetControllerChangeTest.java @@ -28,7 +28,6 @@ public class TargetControllerChangeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Evangelize", 1); assertPermanentCount(playerA, "Balduvian Bears", 1); @@ -52,7 +51,6 @@ public class TargetControllerChangeTest extends CardTestPlayerBase { //setStrictChooseMode(true); // AI must choose setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Evangelize", 1); assertPermanentCount(playerA, "Balduvian Bears", 1); // AI give smallest permanent to A as bad effect for target (target control change) diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetPriorityTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetPriorityTest.java index 5810451be4..38143c2db0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetPriorityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetPriorityTest.java @@ -37,7 +37,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Memnite", 3); assertPermanentCount(playerB, "Balduvian Bears", 3); @@ -62,7 +61,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Memnite", 3 - 1); //assertPermanentCount(playerB, "Balduvian Bears", 3); @@ -87,7 +85,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Memnite", 3); assertPermanentCount(playerB, "Balduvian Bears", 3); @@ -118,7 +115,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { //setStrictChooseMode(true); // AI setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Burning Sun's Avatar", 1); assertPermanentCount(playerB, "Ancient Brontodon", 1); // can't be killed @@ -145,7 +141,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { // showHand("after", 1, PhaseStep.BEGIN_COMBAT, playerA); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); /* disabled checks cause target is not yet fixed, see comments at the start file assertPermanentCount(playerB, "Memnite", 1 * cardsMultiplier); @@ -172,7 +167,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Memnite", 3); assertPermanentCount(playerB, "Balduvian Bears", 3); @@ -196,7 +190,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Memnite", 3 - 1); assertPermanentCount(playerB, "Balduvian Bears", 3 - 1); @@ -220,7 +213,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Memnite", 3 - 1); assertPermanentCount(playerB, "Balduvian Bears", 3); @@ -246,7 +238,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Memnite", 3); assertPermanentCount(playerB, "Balduvian Bears", 3); @@ -277,7 +268,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { // showBattlefield("after", 1, PhaseStep.BEGIN_COMBAT, playerA); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "damage 3", 1); @@ -308,7 +298,6 @@ public class TargetPriorityTest extends CardTestPlayerBaseAI { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Memnite", 1 * cardsMultiplier); assertPermanentCount(playerB, "Balduvian Bears", 1 * cardsMultiplier); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetRequiredTest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetRequiredTest.java index 8feb009fc4..07f5e52f40 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetRequiredTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetRequiredTest.java @@ -29,7 +29,6 @@ public class TargetRequiredTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Redcap Melee", 1); assertGraveyardCount(playerA, "Mountain", 1); @@ -51,7 +50,6 @@ public class TargetRequiredTest extends CardTestPlayerBase { //setStrictChooseMode(true); AI must select targets setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Redcap Melee", 1); assertGraveyardCount(playerA, "Mountain", 1); @@ -73,7 +71,6 @@ public class TargetRequiredTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Redcap Melee", 1); assertGraveyardCount(playerB, "Silvercoat Lion", 1); @@ -93,7 +90,6 @@ public class TargetRequiredTest extends CardTestPlayerBase { //setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Redcap Melee", 1); assertGraveyardCount(playerB, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetStackObjectByAITest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetStackObjectByAITest.java index af84540392..d258cfc28e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetStackObjectByAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TargetStackObjectByAITest.java @@ -35,7 +35,6 @@ public class TargetStackObjectByAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Grizzly Bears", 0); assertGraveyardCount(playerA, "Lightning Bolt", 1); @@ -64,7 +63,6 @@ public class TargetStackObjectByAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); //setStrictChooseMode(true); // AI must choose execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Grizzly Bears", 0); assertGraveyardCount(playerA, "Lightning Bolt", 1); @@ -92,7 +90,6 @@ public class TargetStackObjectByAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); // AI play with full simulation execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Grizzly Bears", 0); assertGraveyardCount(playerA, "Lightning Bolt", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TestFrameworkCanPlayAITest.java b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TestFrameworkCanPlayAITest.java index d5a9066a5a..e90f6bee0a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/AI/basic/TestFrameworkCanPlayAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/AI/basic/TestFrameworkCanPlayAITest.java @@ -27,7 +27,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Lightning Bolt", 1); assertPermanentCount(playerB, "Balduvian Bears", 5 - 1); @@ -46,7 +45,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Lightning Bolt", 3); assertPermanentCount(playerB, "Balduvian Bears", 5 - 3); @@ -62,7 +60,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 2); } @@ -79,7 +76,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, 1); assertGraveyardCount(playerB, 1); @@ -102,7 +98,6 @@ public class TestFrameworkCanPlayAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); Assert.assertEquals(1, currentGame.getBattlefield().getAllActivePermanents(CardType.CREATURE, currentGame).size()); Permanent permanent = currentGame.getBattlefield().getAllActivePermanents(CardType.CREATURE, currentGame).get(0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java index 0eaa4d4e00..e32df95548 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ChaosWandTest.java @@ -29,7 +29,6 @@ public class ChaosWandTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 + 3); // +3 from blood assertLife(playerB, 20 - 3); // -3 from blood diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java index 58cf5fe0d0..de5f27b9b0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/LightningStormTest.java @@ -46,7 +46,6 @@ public class LightningStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Lightning Storm", 1); assertGraveyardCount(playerB, "Mountain", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ReconfigureTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ReconfigureTest.java index 1b078a7378..0822fd180c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ReconfigureTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/ReconfigureTest.java @@ -30,7 +30,6 @@ public class ReconfigureTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertType(boar, CardType.CREATURE, false); assertSubtype(boar, SubType.EQUIPMENT); @@ -51,7 +50,6 @@ public class ReconfigureTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertType(boar, CardType.CREATURE, true); assertSubtype(boar, SubType.EQUIPMENT); @@ -73,7 +71,6 @@ public class ReconfigureTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertType(boar, CardType.CREATURE, false); assertSubtype(boar, SubType.EQUIPMENT); @@ -94,7 +91,6 @@ public class ReconfigureTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertType(boar, CardType.CREATURE, false); assertSubtype(boar, SubType.EQUIPMENT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java index ecbcae1b9c..3074f8878e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java @@ -41,7 +41,6 @@ public class CurseOfShallowGravesTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2 - 2); @@ -70,7 +69,6 @@ public class CurseOfShallowGravesTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java index 5a88379449..f8ded2e7f7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CursesTest.java @@ -388,7 +388,6 @@ public class CursesTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); } catch (Throwable e) { if (!e.getMessage().contains("Missing CHOICE def for turn 2, step UPKEEP, PlayerB")) { Assert.fail("Should have had error about needing a target, but got:\n" + e.getMessage()); 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 b0d937d40b..db9cb59e4f 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 @@ -29,7 +29,6 @@ public class AetherFigmentTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BronzehideLionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BronzehideLionTest.java index 11714506ee..1ce2a16fe2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BronzehideLionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BronzehideLionTest.java @@ -26,7 +26,6 @@ public class BronzehideLionTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terror", lion); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, lion, 0); assertIsAttachedTo(playerA, lion, "Grizzly Bears"); } @@ -42,7 +41,6 @@ public class BronzehideLionTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terror", lion); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, lion, 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java index 759ebf45d2..1adea9eca2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java @@ -35,8 +35,6 @@ public class GatherSpecimensTest extends CardTestPlayerBase { execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Gather Specimens", 1); assertPermanentCount(playerA, "Memnite", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/GisaGloriousResurrectorBlinkedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/GisaGloriousResurrectorBlinkedTest.java index 228e701f77..e1fcad7af7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/GisaGloriousResurrectorBlinkedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/GisaGloriousResurrectorBlinkedTest.java @@ -29,7 +29,6 @@ public class GisaGloriousResurrectorBlinkedTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); // should be under playerA control assertPermanentCount(playerA, "Memnite", 1); @@ -53,7 +52,6 @@ public class GisaGloriousResurrectorBlinkedTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); // exiled Memnite stays in exile zone assertPermanentCount(playerA, "Memnite", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java index 0972d46590..bff28e589a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AffinityForArtifactsTest.java @@ -24,7 +24,6 @@ public class AffinityForArtifactsTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Myr Enforcer", 4); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AfflictTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AfflictTest.java index d5c2da1270..25cd66fa76 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AfflictTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AfflictTest.java @@ -22,7 +22,6 @@ public class AfflictTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 19); } @@ -41,7 +40,6 @@ public class AfflictTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 19); @@ -57,7 +55,6 @@ public class AfflictTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 18); } @@ -87,7 +84,6 @@ public class AfflictTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.DECLARE_BLOCKERS, playerA, "{2},", "Frontline Devastator"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Frontline Devastator", 1); assertPermanentCount(playerB, "Ruin Rat", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java index 328ffa00d1..f7456c3b0e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java @@ -31,7 +31,6 @@ public class AmplifyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Kilnmouth Dragon", 1); assertPowerToughness(playerA, "Kilnmouth Dragon", 8,8); // 5 + 3 from Amplify @@ -55,7 +54,6 @@ public class AmplifyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Kilnmouth Dragon", 1); assertPowerToughness(playerA, "Kilnmouth Dragon", 11,11); // 5 + 6 from Amplify @@ -88,7 +86,6 @@ public class AmplifyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Kilnmouth Dragon", 1); assertPowerToughness(playerA, "Kilnmouth Dragon", 8,8); // 5 + 3 from Amplify @@ -123,7 +120,6 @@ public class AmplifyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Kilnmouth Dragon", 1); assertPowerToughness(playerA, "Kilnmouth Dragon", 5,5); // 5 + 0 from Amplify diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java index 4cb9dcc752..bbb8014811 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AnnihilatorTest.java @@ -70,7 +70,6 @@ public class AnnihilatorTest extends CardTestPlayerBase { setChoice(playerA, "Academy Rector"); // Annihilator setChoice(playerA, "Plains"); // Annihilator castSpell(2, PhaseStep.DECLARE_ATTACKERS, playerA, "Cauldron Haze", "Academy Rector", "Annihilator"); - setChoice(playerA, false); // Academy Rector No Exile setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AssistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AssistTest.java index 7210f12e69..2bdda0c187 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AssistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AssistTest.java @@ -22,7 +22,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -37,7 +36,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -53,7 +51,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -69,7 +66,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -85,7 +81,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -110,7 +105,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Charging Binox", 1); } @@ -130,7 +124,6 @@ public class AssistTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Charging Binox", 1); assertTappedCount("Forest", false, 8); // no mana used diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AwakenTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AwakenTest.java index 3628f283ac..2f7646ecd7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AwakenTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AwakenTest.java @@ -146,7 +146,6 @@ public class AwakenTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -173,6 +172,5 @@ public class AwakenTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } 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 5aa2a8df33..2e1dd8bffa 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 @@ -53,7 +53,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // because of protection the Hopeful Eidolon should be a creature on the battlefield assertPermanentCount(playerA, "Silent Artisan", 1); @@ -73,7 +72,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silent Artisan", 1); assertPowerToughness(playerA, "Silent Artisan", 4, 6); @@ -103,7 +101,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // because Boon Satyr is no creature on the battlefield, evolve may not trigger assertPermanentCount(playerA, "Boon Satyr", 1); @@ -135,7 +132,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // because Boon Satyr is no creature on the battlefield, evolve may not trigger assertLife(playerA, 20); @@ -171,7 +167,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // because Boon Satyr is no creature on the battlefield, evolve may not trigger assertPermanentCount(playerA, "Silent Artisan", 1); @@ -225,7 +220,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Cyclops of One-Eyed Pass", 1); assertHandCount(playerB, 0); @@ -268,7 +262,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // assertHandCount(playerA, "Hypnotic Siren", 0); @@ -306,7 +299,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 18); // -2 from Chandra's Outrage assertLife(playerB, 18); // -2 from attack of Mogis's Warhound @@ -365,7 +357,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 18); // -2 from Chandra's Outrage assertLife(playerA, 16); // -3 from attack Alesha with bestowed Nighthowler @@ -394,7 +385,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20); assertTapped("Sightless Brawler", false); @@ -417,7 +407,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 15); assertTapped("Sightless Brawler", true); @@ -440,7 +429,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Sightless Brawler", 0); assertLife(playerB, 20); @@ -467,7 +455,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Sightless Brawler", 0); assertLife(playerB, 14); @@ -505,7 +492,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Song of the Dryads", 1); @@ -538,7 +524,6 @@ public class BestowTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Nylea's Emissary", 1); assertPowerToughness(playerA, "Silvercoat Lion", 5, 5); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BlitzTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BlitzTest.java index 9bad1199a9..8da07aad58 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BlitzTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BlitzTest.java @@ -46,7 +46,6 @@ public class BlitzTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, decoy, 1); assertBlitzed(decoy, true); @@ -62,7 +61,6 @@ public class BlitzTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, decoy, 0); assertGraveyardCount(playerA, decoy, 1); @@ -79,7 +77,6 @@ public class BlitzTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, decoy, 1); assertBlitzed(decoy, false); @@ -119,7 +116,6 @@ public class BlitzTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertBlitzed(underdog, true); assertLife(playerA, 20 - 2); @@ -137,7 +133,6 @@ public class BlitzTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertBlitzed(underdog, false); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BolsterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BolsterTest.java index c83bc8fa8d..a3335b2bf8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BolsterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BolsterTest.java @@ -33,7 +33,6 @@ public class BolsterTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCounterCount("Elite Scaleguard", CounterType.P1P1, 2); assertPowerToughness(playerA, "Elite Scaleguard", 4, 5); @@ -53,7 +52,6 @@ public class BolsterTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Elite Scaleguard", 2, 3); assertCounterCount("Silvercoat Lion", CounterType.P1P1, 2); @@ -79,7 +77,6 @@ public class BolsterTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Elite Scaleguard", 2, 3); assertCounterCount("Silvercoat Lion", CounterType.P1P1, 2); @@ -115,7 +112,6 @@ public class BolsterTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Elite Scaleguard", 2, 3); assertCounterCount("Silvercoat Lion", CounterType.P1P1, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java index 293ca054c7..66f01d6b66 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BuybackTest.java @@ -28,7 +28,6 @@ public class BuybackTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Silvercoat Lion", 4, 4); assertHandCount(playerA, "Elvish Fury", 1); @@ -49,7 +48,6 @@ public class BuybackTest extends CardTestPlayerBase { //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Silvercoat Lion", 4, 4); assertHandCount(playerA, "Elvish Fury", 1); @@ -155,6 +153,5 @@ public class BuybackTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CompleatedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CompleatedTest.java index 1bd21b656a..cee01befdb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CompleatedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CompleatedTest.java @@ -24,7 +24,6 @@ public class CompleatedTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, tamiyo, CounterType.LOYALTY, 3); } @@ -40,7 +39,6 @@ public class CompleatedTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, tamiyo, CounterType.LOYALTY, 5); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConniveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConniveTest.java index 23cfcb9517..faa29cfe83 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConniveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConniveTest.java @@ -30,7 +30,6 @@ public class ConniveTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Hypnotic Grifter", 1, 2); // Discarded a land card assertHandCount(playerA, 1); // 1 from drawing at start of turn @@ -56,7 +55,6 @@ public class ConniveTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Hypnotic Grifter", 2, 3); // Discarded a non-land assertHandCount(playerA, 1); // 1 from drawing at start of turn @@ -86,7 +84,6 @@ public class ConniveTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Hypnotic Grifter", 2, 3); // Discarded a non-land assertHandCount(playerA, 1); // 1 from drawing at start of turn @@ -130,7 +127,6 @@ public class ConniveTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerB, "Crazed Goblin", 1, 1); // Discarded only lands assertGraveyardCount(playerB, "Plains", 3); @@ -172,7 +168,6 @@ public class ConniveTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 1); // Drew a card at start of turn assertHandCount(playerB, "Sol Ring", 1); // Returned by Psychic Pickpocket's ability diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java index 792b566d98..dee96eae6a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java @@ -97,7 +97,6 @@ public class ConspireTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Wort, the Raidmother", 1); assertGraveyardCount(playerA, "Lightning Bolt", 1); @@ -131,7 +130,6 @@ public class ConspireTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Wort, the Raidmother", 1); assertGraveyardCount(playerA, "Lightning Bolt", 1); @@ -260,7 +258,6 @@ public class ConspireTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Burn Trail", 1); assertLife(playerB, 20 - 3 - 3); @@ -285,7 +282,6 @@ public class ConspireTest extends CardTestPlayerBase { //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Burn Trail", 1); assertLife(playerB, 20 - 3 - 3); @@ -310,7 +306,6 @@ public class ConspireTest extends CardTestPlayerBase { //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Burn Trail", 1); assertLife(playerB, 20 - 3); // simple cast diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java index 4b242e1d88..655a410756 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java @@ -24,7 +24,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -40,7 +39,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -56,7 +54,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -73,7 +70,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -90,7 +86,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -116,7 +111,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 4); } @@ -136,7 +130,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { //setStrictChooseMode(true); AI must choose targets setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 4); } @@ -160,7 +153,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 4); } @@ -180,7 +172,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 4); } @@ -202,7 +193,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -231,7 +221,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -255,7 +244,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Alpha Myr", 1); } @@ -291,7 +279,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -312,7 +299,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Hogaak, Arisen Necropolis", 1); } @@ -337,7 +323,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Hogaak, Arisen Necropolis", 1); } @@ -361,7 +346,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Soldier Token", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CrewTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CrewTest.java index 31ac01d196..807f96b126 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CrewTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CrewTest.java @@ -43,7 +43,6 @@ public class CrewTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertTappedCount(lion, true, 2); assertPowerToughness(playerA, caravan, 5, 5); @@ -64,7 +63,6 @@ public class CrewTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertTappedCount(fanatic, true, 1); assertPowerToughness(playerA, copter, 3, 3); @@ -90,7 +88,6 @@ public class CrewTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Only crewed vehicles have card type creature assertNotType(copter, CardType.CREATURE); @@ -105,7 +102,6 @@ public class CrewTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertTapped(ox, true); assertType(plow, CardType.CREATURE, true); @@ -120,7 +116,6 @@ public class CrewTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(kotori, true); assertType(crusher, CardType.ARTIFACT, true); @@ -136,7 +131,6 @@ public class CrewTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(mechanic, true); assertType(express, CardType.ARTIFACT, true); @@ -152,7 +146,6 @@ public class CrewTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, jace, CounterType.LOYALTY, 2); assertType(heart, CardType.ARTIFACT, true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java index a5fc11b7f3..70703d4375 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CumulativeUpkeepTest.java @@ -39,8 +39,6 @@ public class CumulativeUpkeepTest extends CardTestPlayerBase { setStopAt(7, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Phobian Phantasm", 1); assertLife(playerA, 20); @@ -95,8 +93,6 @@ public class CumulativeUpkeepTest extends CardTestPlayerBase { setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertLife(playerA, 40); assertLife(playerB, 21); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DayNightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DayNightTest.java index 6525e7c000..06d86f06ba 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DayNightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DayNightTest.java @@ -54,7 +54,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertRuffianSmasher(true); } @@ -70,7 +69,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertRuffianSmasher(false); } @@ -86,7 +84,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertRuffianSmasher(false); } @@ -103,7 +100,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertRuffianSmasher(true); } @@ -120,7 +116,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertRuffianSmasher(true); assertPermanentCount(playerA, outcasts, 0); @@ -140,7 +135,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertDayNight(true); assertPowerToughness(playerA, smasher, 6 + 1, 5 + 1); @@ -170,7 +164,6 @@ public class DayNightTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertRuffianSmasher(true); } @@ -195,7 +188,6 @@ public class DayNightTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertRuffianSmasher(false); } @@ -225,7 +217,6 @@ public class DayNightTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertRuffianSmasher(false); } @@ -240,7 +231,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertDayNight(true); Permanent permanent = getPermanent(curse); @@ -259,7 +249,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertDayNight(false); assertPermanentCount(playerA, curse, 0); @@ -277,7 +266,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertDayNight(false); assertPermanentCount(playerA, curse, 0); @@ -297,7 +285,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertDayNight(true); Permanent permanent = getPermanent(curse); @@ -315,7 +302,6 @@ public class DayNightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertDayNight(true); assertLife(playerB, 20); @@ -341,7 +327,6 @@ public class DayNightTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.UPKEEP); execute(); - assertAllCommandsUsed(); assertDayNight(true); assertLife(playerB, 20 - 1 - 3 - 3 - 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java index b76f0cfad2..7c45531468 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java @@ -18,7 +18,6 @@ public class DecayedTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Falcon Abomination", 1); assertPermanentCount(playerA, "Zombie Token", 0); } @@ -40,7 +39,6 @@ public class DecayedTest extends CardTestPlayerBase { setStopAt(5, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Gisa, Glorious Resurrector", 1); assertPermanentCount(playerA, "Grizzly Bears", 0); assertPermanentCount(playerB, "Grizzly Bears", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java index c1616f25ec..bb027aba0c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java @@ -37,7 +37,6 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Balduvian Bears", 4); assertGraveyardCount(playerA, "Descend upon the Sinful", 1); @@ -70,7 +69,6 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Balduvian Bears", 4); assertGraveyardCount(playerA, "Descend upon the Sinful", 1); @@ -110,7 +108,6 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertExileCount(playerA, "Balduvian Bears", 4); @@ -145,7 +142,6 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertExileCount(playerA, "Balduvian Bears", 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DelveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DelveTest.java index b657263388..80e86bdba8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DelveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DelveTest.java @@ -41,7 +41,6 @@ public class DelveTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ethereal Forager", 1); } @@ -60,7 +59,6 @@ public class DelveTest extends CardTestPlayerBaseWithAIHelps { //setStrictChooseMode(true); AI must choose targets setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ethereal Forager", 1); } @@ -78,7 +76,6 @@ public class DelveTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ethereal Forager", 1); } @@ -114,7 +111,6 @@ public class DelveTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 1); // no resolve, so no draw cards (if rollback bug active then it shows 3 cards) } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DisturbTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DisturbTest.java index f4433cefb7..6f415cc488 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DisturbTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DisturbTest.java @@ -69,7 +69,6 @@ public class DisturbTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } /** @@ -108,7 +107,6 @@ public class DisturbTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } /** @@ -128,7 +126,6 @@ public class DisturbTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } /** @@ -164,7 +161,6 @@ public class DisturbTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } /** @@ -199,7 +195,6 @@ public class DisturbTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } /** @@ -222,14 +217,12 @@ public class DisturbTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ghastlyMimictry, 1); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, lightningBolt, "Alloy Myr"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(mirrorhallMimic, 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java index b4e427738a..81b8374010 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EchoTest.java @@ -57,7 +57,6 @@ public class EchoTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java index 1946604d6f..190f7e878a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EntwineTest.java @@ -30,7 +30,6 @@ public class EntwineTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertPermanentCount(playerA, "Balduvian Bears", 0); @@ -56,7 +55,6 @@ public class EntwineTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 3); assertPermanentCount(playerA, "Balduvian Bears", 0); @@ -84,7 +82,6 @@ public class EntwineTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 3); assertPermanentCount(playerA, "Balduvian Bears", 0); @@ -112,7 +109,6 @@ public class EntwineTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 3); assertPermanentCount(playerA, "Balduvian Bears", 0); @@ -142,7 +138,6 @@ public class EntwineTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 3); assertPermanentCount(playerA, "Balduvian Bears", 0); @@ -170,7 +165,6 @@ public class EntwineTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPermanentCount(playerA, "Pillarfield Ox", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java index 5ffa218c58..1d7145fc66 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java @@ -21,7 +21,6 @@ public class EpicTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(7, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Snake Token", 3 + 3 + 4 + 5); assertPermanentCount(playerA, "Forest", 8); @@ -39,7 +38,6 @@ public class EpicTest extends CardTestPlayerBase { setStopAt(7, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Snake Token", 2 * (3 + 3 + 4 + 5)); assertPermanentCount(playerA, "Tropical Island", 10); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java index fbbe2e8d0e..e34b61c528 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvolveTest.java @@ -171,7 +171,6 @@ public class EvolveTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java index 148e369028..556a31968a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java @@ -564,7 +564,6 @@ public class FlashbackTest extends CardTestPlayerBase { // TODO: Can't use checkPlayableAbility on Force of Will in this case. try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -655,6 +654,5 @@ public class FlashbackTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForetellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForetellTest.java index 4ed228e957..b9dda7b1e1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForetellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForetellTest.java @@ -26,7 +26,6 @@ public class ForetellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Behold the Multiverse", 1); } @@ -42,7 +41,6 @@ public class ForetellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Behold the Multiverse", 1); // still in exile because it can't be cast the same turn } @@ -57,7 +55,6 @@ public class ForetellTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Behold the Multiverse", 0); // no longer in exile assertGraveyardCount(playerA, "Behold the Multiverse", 1); // now in graveyard assertHandCount(playerA, 2); // 2 cards drawn @@ -76,8 +73,7 @@ public class ForetellTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fore"); // foretell the Lightning Bolt setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - - assertAllCommandsUsed(); + assertExileCount(playerA, "Sol Talisman", 1); // suspend card in exile assertExileCount(playerA, "Lightning Bolt", 1); // foretold card in exile assertPowerToughness(playerA, "Dream Devourer", 2, 3); // +2 power boost from trigger due to foretell of Lightning Bolt diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GoadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GoadTest.java index ba1927d7ce..637b208dff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GoadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/GoadTest.java @@ -10,7 +10,6 @@ import mage.game.GameException; import mage.game.mulligan.MulliganType; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.util.functions.Function; import org.junit.Assert; import org.junit.Test; import org.mage.test.player.TestPlayer; @@ -119,7 +118,6 @@ public class GoadTest extends CardTestMultiPlayerBase { setStopAt(2, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); assertGoaded(lion, playerA); assertAttacking(lion, playerB, playerC); @@ -138,7 +136,6 @@ public class GoadTest extends CardTestMultiPlayerBase { setStopAt(2, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); assertGoaded(lion, playerA); assertAttacking(lion, playerC); @@ -158,7 +155,6 @@ public class GoadTest extends CardTestMultiPlayerBase { setStopAt(2, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); assertGoaded(lion, playerA); assertAttacking(lion, playerA); @@ -182,7 +178,6 @@ public class GoadTest extends CardTestMultiPlayerBase { setStopAt(3, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); assertGoaded(lion, playerA, playerD); assertAttacking(lion, playerB); @@ -207,7 +202,6 @@ public class GoadTest extends CardTestMultiPlayerBase { setStopAt(3, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); assertGoaded(lion, playerA, playerD); assertAttacking(lion, playerA, playerD); @@ -219,7 +213,6 @@ public class GoadTest extends CardTestMultiPlayerBase { setStopAt(1, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); assertAttacking("Berserkers of Blood Ridge", playerB, playerC, playerD); } @@ -253,7 +246,6 @@ public class GoadTest extends CardTestMultiPlayerBase { setStopAt(2, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); assertGoaded("Goblin Balloon Brigade", playerA); assertNotGoaded("Goblin Champion", playerA); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HexproofTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HexproofTest.java index 4e20ce02d5..4ce6652ddc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HexproofTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HexproofTest.java @@ -127,7 +127,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Swamp", 1); assertCounterCount(playerA, "Liliana Vess", CounterType.LOYALTY, 5 + 1); @@ -154,7 +153,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { if (!e.getMessage().contains("setup good targets")) { @@ -181,7 +179,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // no discarded cards assertGraveyardCount(playerA, 0); @@ -212,7 +209,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // no discarded cards assertGraveyardCount(playerA, 0); @@ -231,7 +227,6 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3 * 3); } @@ -265,6 +260,5 @@ public class HexproofTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java index 224f518953..c8d3d97c83 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java @@ -45,7 +45,6 @@ public class HideawayTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Shelldock Isle", 1); assertExileCount(playerA, "Silvercoat Lion", 1); @@ -87,7 +86,6 @@ public class HideawayTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertExileCount("Dross Crocodile", 2); assertPermanentCount(playerA, "Mosswort Bridge", 1); @@ -132,7 +130,6 @@ public class HideawayTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ghost Quarter", 0); assertTapped("Windbrisk Heights", true); @@ -191,7 +188,6 @@ public class HideawayTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ghost Quarter", 1); assertTapped("Windbrisk Heights", true); @@ -225,7 +221,6 @@ public class HideawayTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ghost Quarter", 1); assertTapped("Windbrisk Heights", true); @@ -265,7 +260,6 @@ public class HideawayTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertTappedCount("Island", true, 1); assertPermanentCount(playerA, sIsle, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ImproviseTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ImproviseTest.java index e0712c2c41..e826099026 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ImproviseTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ImproviseTest.java @@ -35,7 +35,6 @@ public class ImproviseTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Bastion Inventor", 1); } @@ -54,7 +53,6 @@ public class ImproviseTest extends CardTestPlayerBaseWithAIHelps { //setStrictChooseMode(true); AI must choose targets setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Bastion Inventor", 1); } @@ -72,7 +70,6 @@ public class ImproviseTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Bastion Inventor", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java index 69e3242389..84e6f8d7c3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java @@ -60,7 +60,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Aether Figment", 1); assertCounterCount("Aether Figment", CounterType.P1P1, 2); @@ -80,7 +79,6 @@ public class KickerTest extends CardTestPlayerBase { //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Aether Figment", 1); assertCounterCount("Aether Figment", CounterType.P1P1, 2); @@ -98,7 +96,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Aether Figment", 1); assertCounterCount("Aether Figment", CounterType.P1P1, 0); @@ -118,7 +115,6 @@ public class KickerTest extends CardTestPlayerBase { //setStrictChooseMode(true); - AI must choose setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Aether Figment", 1); assertCounterCount("Aether Figment", CounterType.P1P1, 0); @@ -143,7 +139,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Apex Hawks", 1); assertCounterCount("Apex Hawks", CounterType.P1P1, 1); @@ -164,7 +159,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Apex Hawks", 1); assertCounterCount("Apex Hawks", CounterType.P1P1, 2); @@ -182,7 +176,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Apex Hawks", 1); assertCounterCount("Apex Hawks", CounterType.P1P1, 0); @@ -206,7 +199,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Sunscape Battlemage", 1); assertHandCount(playerA, 2); @@ -234,7 +226,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Birds of Paradise", 1); assertPermanentCount(playerA, "Sunscape Battlemage", 1); @@ -271,7 +262,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Birds of Paradise", 1); assertGraveyardCount(playerB, "Ertai's Trickery", 1); @@ -305,7 +295,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Hallar, the Firefletcher", CounterType.P1P1, 1); assertLife(playerB, 20 - 2 - 1); // 2 damage from kicked spell, 1 damage from hallar's trigger @@ -346,7 +335,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Boomerang", 1); assertGraveyardCount(playerB, "Birds of Paradise", 1); @@ -393,7 +381,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 2 * 2); } @@ -451,7 +438,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // cast spell - countered // copied spell - resolved (2 damage) @@ -497,7 +483,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // cast spell - countered @@ -550,7 +535,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } /** @@ -582,7 +566,6 @@ public class KickerTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -622,7 +605,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); Assert.assertEquals("All mana has to be used", "[]", playerA.getManaAvailable(currentGame).toString()); assertGraveyardCount(playerB, "Lightning Bolt", 1); @@ -653,7 +635,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertTappedCount("Swamp", true, 5); assertGraveyardCount(playerA, "Marsh Casualties", 1); @@ -683,7 +664,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Ardent Soldier", CounterType.P1P1, 1); // from kicker } @@ -717,7 +697,6 @@ public class KickerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Brain in a Jar", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java index 9117005b4c..9180767592 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithAnyNumberModesAbilityTest.java @@ -29,7 +29,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2); assertLife(playerA, 20); @@ -57,7 +56,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2); assertLife(playerA, 20 + 4); @@ -87,7 +85,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2); assertLife(playerA, 20 + 4); @@ -117,7 +114,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2); assertLife(playerA, 20 + 4); @@ -149,7 +145,6 @@ public class KickerWithAnyNumberModesAbilityTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Balduvian Bears", 2 + 2, 2 + 2); assertLife(playerA, 20 + 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java index 1c6fe418ad..f61e7de407 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerWithFlashbackTest.java @@ -31,7 +31,6 @@ public class KickerWithFlashbackTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -57,7 +56,6 @@ public class KickerWithFlashbackTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -85,7 +83,6 @@ public class KickerWithFlashbackTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java index a51fa27790..c8aef686d8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java @@ -49,7 +49,6 @@ public class MadnessTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Arrogant Wurm", 1); assertGraveyardCount(playerA, "Raven's Crime", 1); @@ -70,7 +69,6 @@ public class MadnessTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Arrogant Wurm", 0); assertGraveyardCount(playerA, "Raven's Crime", 1); @@ -130,7 +128,6 @@ public class MadnessTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Haunting Hymn", 1); assertGraveyardCount(playerA, "Avacyn's Judgment", 1); @@ -185,7 +182,6 @@ public class MadnessTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Falkenrath Gorger", 1); assertPermanentCount(playerA, "Asylum Visitor", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java index 125476f40e..261a38076f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java @@ -33,7 +33,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -66,7 +65,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -102,7 +100,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -141,7 +138,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -178,7 +174,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -221,7 +216,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -260,7 +254,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -303,7 +296,6 @@ public class ManifestTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -342,7 +334,6 @@ public class ManifestTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -383,7 +374,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -419,7 +409,6 @@ public class ManifestTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -468,7 +457,6 @@ public class ManifestTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // no life gain assertLife(playerA, 20); @@ -520,9 +508,8 @@ public class ManifestTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - // no life gain + // no life gain assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MeldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MeldTest.java index 31c30bbeef..e9c7d7f6be 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MeldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MeldTest.java @@ -39,7 +39,6 @@ public class MeldTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java index 281bb53487..7dc30a6512 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ModularTest.java @@ -161,7 +161,6 @@ public class ModularTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Arcbound Lancer", 1); assertGraveyardCount(playerA, "Puncture Blast", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java index 2f1eabae2f..d07f91a718 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java @@ -363,7 +363,6 @@ public class MorphTest extends CardTestPlayerBase { // showBattlefield("A battle after", 1, PhaseStep.END_TURN, playerA); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20); @@ -700,7 +699,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Reflector Mage", 1); assertPermanentCount(playerB, "Rattleclaw Mystic", 0); @@ -793,7 +791,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Brine Elemental", 1); assertPermanentCount(playerB, "Brine Elemental", 1); @@ -968,8 +965,6 @@ public class MorphTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Zoetic Cavern", 1); } @@ -987,7 +982,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Zoetic Cavern", 0); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1); @@ -1015,7 +1009,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Island", 1); assertPermanentCount(playerA, "Zoetic Cavern", 0); @@ -1041,7 +1034,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Zoetic Cavern", 0); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1); @@ -1065,7 +1057,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -1086,7 +1077,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1); } @@ -1109,7 +1099,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1); } @@ -1141,7 +1130,6 @@ public class MorphTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java index 3ff8e9b897..2babfda05b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java @@ -69,7 +69,6 @@ public class OfferingTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, patron, 1); assertGraveyardCount(playerA, "Akki Drillmaster", 1); @@ -99,7 +98,6 @@ public class OfferingTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, patron, 1); assertGraveyardCount(playerA, "Boros Recruit", 1); @@ -132,7 +130,6 @@ public class OfferingTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, patron, 1); assertGraveyardCount(playerA, "Boggart Ram-Gang", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OverloadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OverloadTest.java index 101fe368ca..b1e0e249c4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OverloadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OverloadTest.java @@ -38,7 +38,6 @@ public class OverloadTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Vandalblast", 1); assertGraveyardCount(playerB, "Mental Misstep", 1); @@ -67,7 +66,6 @@ public class OverloadTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Cyclonic Rift", 1); assertPermanentCount(playerB, "Swamp", 1); @@ -96,7 +94,6 @@ public class OverloadTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Cyclonic Rift", 1); assertPermanentCount(playerB, "Swamp", 1); @@ -141,7 +138,6 @@ public class OverloadTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Cyclonic Rift", 1); assertGraveyardCount(playerA, "Cyclonic Rift", 0); // imprinted copy discarded diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java index 23c78dfae6..37aa15f1b1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProwlTest.java @@ -34,7 +34,6 @@ public class ProwlTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 19); assertPermanentCount(playerA, "Bloodmark Mentor", 1); @@ -70,7 +69,6 @@ public class ProwlTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 18); assertPermanentCount(playerA, "Goblin Warchief", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java index 60e56bdcf2..f17bca8950 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReboundTest.java @@ -64,7 +64,7 @@ public class ReboundTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Distortion Strike", "Memnite"); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); - execute();assertAllCommandsUsed(); + execute(); //check exile and graveyard assertPowerToughness(playerA, "Memnite", 2, 1); @@ -133,7 +133,6 @@ public class ReboundTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); //check exile and graveyard assertGraveyardCount(playerB, "Lightning Bolt", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java index 0312e318fa..1b9c3c14c4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ReplicateTest.java @@ -99,7 +99,6 @@ public class ReplicateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3); // 1 + 2 replicates } @@ -124,7 +123,6 @@ public class ReplicateTest extends CardTestPlayerBase { //setStrictChooseMode(true); - AI must choice setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3); // 1 + 2 replicates } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java index 15b5b1f0e1..90296d7fe3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RiotTest.java @@ -35,7 +35,6 @@ public class RiotTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Rampaging Rendhorn", 1); assertPowerToughness(playerA, "Rampaging Rendhorn", 5, 5); @@ -56,7 +55,6 @@ public class RiotTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Rampaging Rendhorn", 1); assertPowerToughness(playerA, "Rampaging Rendhorn", 4, 4); @@ -81,7 +79,6 @@ public class RiotTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPowerToughness(playerA, "Silvercoat Lion", 3, 3); @@ -109,7 +106,6 @@ public class RiotTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPowerToughness(playerA, "Silvercoat Lion", 2 + 2, 2 + 2); @@ -135,7 +131,6 @@ public class RiotTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPowerToughness(playerA, "Silvercoat Lion", 2, 2); @@ -161,7 +156,6 @@ public class RiotTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPowerToughness(playerA, "Silvercoat Lion", 3, 3); @@ -187,7 +181,6 @@ public class RiotTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPowerToughness(playerA, "Silvercoat Lion", 2, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SupportTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SupportTest.java index c826edcc87..29ff648fca 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SupportTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SupportTest.java @@ -31,7 +31,6 @@ public class SupportTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Silvercoat Lion", 2 + 1, 2 + 1); assertPowerToughness(playerA, "Pillarfield Ox", 2 + 1, 4 + 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SuspendTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SuspendTest.java index 8019c7fa44..5a8536f4b7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SuspendTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SuspendTest.java @@ -233,7 +233,6 @@ public class SuspendTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(7, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -268,7 +267,6 @@ public class SuspendTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(7, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -311,7 +309,6 @@ public class SuspendTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(7, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -345,7 +342,6 @@ public class SuspendTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, "Mox Tantalite", 1); // suspended } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java index e9d6ae2b28..364477bf61 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java @@ -173,7 +173,6 @@ public class TransformTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, 13); assertGraveyardCount(playerA, "Startled Awake", 0); @@ -198,7 +197,6 @@ public class TransformTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, 13); assertGraveyardCount(playerA, "Startled Awake", 0); @@ -308,7 +306,6 @@ public class TransformTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Silvercoat Lion", 1); @@ -489,7 +486,6 @@ public class TransformTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Delver of Secrets", 1); assertPermanentCount(playerA, "Insectile Aberration", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/WardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/WardTest.java index b21b86b41e..ba056f35c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/WardTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/WardTest.java @@ -30,6 +30,5 @@ public class WardTest extends CardTestPlayerBase { assertExileCount("Healer's Hawk", 1); assertGraveyardCount(playerA, "Solitude", 1); assertPermanentCount(playerB, "Waterfall Aerialist", 1); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java index 553a0e9c19..8ab2f4432e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/ConditionalOneShotEffectTest.java @@ -26,8 +26,7 @@ public class ConditionalOneShotEffectTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, "Unlicensed Disintegration", 1); assertGraveyardCount(playerB, "Silvercoat Lion", 1); @@ -61,8 +60,7 @@ public class ConditionalOneShotEffectTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, "Unlicensed Disintegration", 1); assertGraveyardCount(playerB, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java index 8a926aefc1..d133a3f12b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java @@ -151,7 +151,6 @@ public class AddingCountersToPermanentsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Lightning Bolt", 1); assertPowerToughness(playerA, "Kitchen Finks", 2, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java index a8ac15f21b..e4db367ee6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java @@ -88,8 +88,6 @@ public class CounterspellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Twincast", 1); @@ -124,8 +122,6 @@ public class CounterspellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Twincast", 1); @@ -160,8 +156,6 @@ public class CounterspellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Twincast", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java index 6fed544563..98ff75d988 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DisruptingShoalTest.java @@ -37,7 +37,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Disrupting Shoal", 1); assertGraveyardCount(playerA, "Silvercoat Lion", 1); @@ -60,7 +59,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Disrupting Shoal", 1); assertPermanentCount(playerA, "Silvercoat Lion", 1); @@ -103,7 +101,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -145,7 +142,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost assertGraveyardCount(playerB, "Disrupting Shoal", 1); @@ -177,7 +173,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost assertGraveyardCount(playerB, "Disrupting Shoal", 1); @@ -209,7 +204,6 @@ public class DisruptingShoalTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, 1); // Far // Away should be exiled as part of Disrupting alternative cost assertGraveyardCount(playerB, "Disrupting Shoal", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ForceOfWillTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ForceOfWillTest.java index d81b58c931..77eb933714 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ForceOfWillTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ForceOfWillTest.java @@ -73,7 +73,6 @@ public class ForceOfWillTest extends CardTestPlayerBase { // TODO: Needed since the alternative cost is not being properly check for playability. try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { if (!e.getMessage().contains("Can't find available command - activate:Cast Force of Will$target=Thoughtseize")) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java index ab8ea35b34..1181a9a567 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java @@ -37,7 +37,6 @@ public class NotOfThisWorldTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerB, "Not of This World", 0); assertGraveyardCount(playerB, "Not of This World", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/UnlicensedDisintegrationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/UnlicensedDisintegrationTest.java index 4e0469f3cb..ae142b542a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/UnlicensedDisintegrationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/UnlicensedDisintegrationTest.java @@ -43,8 +43,7 @@ public class UnlicensedDisintegrationTest extends CardTestPlayerBase{ setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 20); assertGraveyardCount(playerA, "Unlicensed Disintegration", 1); assertLife(playerB, 17); @@ -69,8 +68,7 @@ public class UnlicensedDisintegrationTest extends CardTestPlayerBase{ setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 20); assertGraveyardCount(playerA, "Unlicensed Disintegration", 1); @@ -93,8 +91,7 @@ public class UnlicensedDisintegrationTest extends CardTestPlayerBase{ setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 20); assertGraveyardCount(playerA, "Unlicensed Disintegration", 1); assertLife(playerB, 20); @@ -116,8 +113,7 @@ public class UnlicensedDisintegrationTest extends CardTestPlayerBase{ setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 20); assertGraveyardCount(playerA, "Unlicensed Disintegration", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/WrathOfGodTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/WrathOfGodTest.java index 5828bf3e20..80135daa82 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/WrathOfGodTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/WrathOfGodTest.java @@ -34,7 +34,6 @@ public class WrathOfGodTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 0); assertPermanentCount(playerA, "Mossbridge Troll", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java index 3a28de0e86..a280eee927 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ChorusOfTheConclaveTest.java @@ -84,8 +84,6 @@ public class ChorusOfTheConclaveTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Roughrider", 1); // costs {R}{2} + {1} = 4 assertCounterCount("Goblin Roughrider", CounterType.P1P1, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/FeatherTheRedeemedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/FeatherTheRedeemedTest.java index bc353d8bd0..02b014f3a0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/FeatherTheRedeemedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/FeatherTheRedeemedTest.java @@ -42,7 +42,6 @@ public class FeatherTheRedeemedTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } @Test @@ -79,7 +78,6 @@ public class FeatherTheRedeemedTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } @Test @@ -116,6 +114,5 @@ public class FeatherTheRedeemedTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainAbilitiesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainAbilitiesTest.java index 43a088ca4f..a3ec556cf8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainAbilitiesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainAbilitiesTest.java @@ -33,7 +33,6 @@ public class GainAbilitiesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); Permanent permanent = getPermanent("Balduvian Bears"); Assert.assertEquals("must have only 1 singleton ability instance from two attachments", @@ -58,7 +57,6 @@ public class GainAbilitiesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); Permanent permanent = getPermanent("Balduvian Bears"); Assert.assertEquals("must have 2 dynamic ability instances from two attachments", diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java index 13279c767d..21fb6ae501 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java @@ -49,7 +49,6 @@ public class GainMenaceAbilityAsSingletonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); Permanent permanent = getPermanent("Minotaur", playerA); Assert.assertEquals("must have only 1 Menace instance", 1, permanent.getAbilities(currentGame).stream() diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ImpelledGiantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ImpelledGiantTest.java index 9a0ffce1b7..8a556458f3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ImpelledGiantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/ImpelledGiantTest.java @@ -21,8 +21,6 @@ public class ImpelledGiantTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertTapped("Hurloon Minotaur", true); assertPowerToughness(playerA, "Impelled Giant", 5, 3); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/MycosynthGolemTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/MycosynthGolemTest.java index 155bdacc5e..c45d085591 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/MycosynthGolemTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/MycosynthGolemTest.java @@ -34,7 +34,6 @@ public class MycosynthGolemTest extends CardTestCommander4Players { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Alpha Myr", 1); assertHandCount(playerA, "Alpha Myr", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/OathOfKayaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/OathOfKayaTest.java index cd78d60a12..41b4135cd5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/OathOfKayaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/OathOfKayaTest.java @@ -25,7 +25,6 @@ public class OathOfKayaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerB, "Liliana, Dreadhorde General", CounterType.LOYALTY, 6); assertLife(playerA, 20); @@ -47,7 +46,6 @@ public class OathOfKayaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerB, "Liliana, Dreadhorde General", CounterType.LOYALTY, 6 - 2 * 2); assertLife(playerA, 20 - 2); @@ -70,7 +68,6 @@ public class OathOfKayaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerB, "Liliana, Dreadhorde General", CounterType.LOYALTY, 6 - 2); assertCounterCount(playerB, "Vivien, Champion of the Wilds", CounterType.LOYALTY, 4 - 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/PaupersCageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/PaupersCageTest.java index 4fabd9ad0b..956997d478 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/PaupersCageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/PaupersCageTest.java @@ -24,7 +24,6 @@ public class PaupersCageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -40,7 +39,6 @@ public class PaupersCageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -56,7 +54,6 @@ public class PaupersCageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2); @@ -72,7 +69,6 @@ public class PaupersCageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(4, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 2 * 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java index 6121a9b12b..cf256efb7e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java @@ -29,7 +29,6 @@ public class RielleTheEverwiseTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 5); @@ -48,7 +47,6 @@ public class RielleTheEverwiseTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 3); @@ -69,7 +67,6 @@ public class RielleTheEverwiseTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AsThoughManaAndAITest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AsThoughManaAndAITest.java index b9c376a726..c1abed9f83 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AsThoughManaAndAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/AsThoughManaAndAITest.java @@ -27,7 +27,6 @@ public class AsThoughManaAndAITest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/DidNotHaveHexproofTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/DidNotHaveHexproofTest.java index 475bae7644..80b8d59d18 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/DidNotHaveHexproofTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/DidNotHaveHexproofTest.java @@ -44,6 +44,5 @@ public class DidNotHaveHexproofTest extends CardTestPlayerBase { assertTapped(dTower, true); assertGraveyardCount(playerA, "Shock", 1); assertLife(playerB, 18); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/IntetTheDreamerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/IntetTheDreamerTest.java index 87ee98e7b2..275538d337 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/IntetTheDreamerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/IntetTheDreamerTest.java @@ -45,7 +45,6 @@ public class IntetTheDreamerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Intet, the Dreamer", 6 + 2, 6 + 2); // boost from Wax } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java index 34517e133e..228c458520 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java @@ -154,7 +154,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Swamp", 1); assertGraveyardCount(playerA, "Forest", 1); @@ -187,7 +186,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Swamp", 1); assertGraveyardCount(playerA, "Forest", 1); @@ -258,7 +256,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Mountain", 2); assertPermanentCount(playerA, "Silvercoat Lion", 0); @@ -305,7 +302,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Mountain", 2); assertPermanentCount(playerA, "Silvercoat Lion", 1); @@ -355,7 +351,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 15); assertPermanentCount(playerB, "Fallen Shinobi", 1); @@ -407,7 +402,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 15); assertPermanentCount(playerB, "Fallen Shinobi", 1); @@ -468,7 +462,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 15); assertPermanentCount(playerB, "Fallen Shinobi", 1); @@ -510,7 +503,6 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Alpha Myr", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayLandsFromGraveyardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayLandsFromGraveyardTest.java index 9114c1d37b..734769c9c3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayLandsFromGraveyardTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayLandsFromGraveyardTest.java @@ -41,7 +41,6 @@ public class PlayLandsFromGraveyardTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Island", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayTopCardFromLibraryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayTopCardFromLibraryTest.java index 47cb9d8123..667b390530 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayTopCardFromLibraryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayTopCardFromLibraryTest.java @@ -29,7 +29,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); assertLife(playerA, 20 - 2); @@ -47,7 +46,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); } @@ -68,7 +66,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Scourge of Nel Toth", 1); assertLife(playerA, 20); @@ -100,7 +97,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, (20 - 6) * 2); assertLife(playerB, 20 / 2); @@ -120,7 +116,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 2); assertLife(playerB, 20); @@ -145,7 +140,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); assertLife(playerA, 20); @@ -169,7 +163,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Swamp", 1); assertLife(playerA, 20); @@ -195,7 +188,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 * 2); assertLife(playerB, 20 / 2); @@ -220,7 +212,6 @@ public class PlayTopCardFromLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java index a0b6820c91..d30a1f58af 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java @@ -138,7 +138,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Hostage Taker", 1); assertTappedCount("Mountain", true, 4); @@ -167,7 +166,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 1); @@ -203,7 +201,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Flicker", 1); assertLife(playerA, 20); @@ -240,7 +237,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); Assert.assertTrue("Mana pool of conditional mana has to be empty", playerA.getManaPool().getConditionalMana().isEmpty()); assertExileCount("Pillarfield Ox", 1); @@ -261,7 +257,6 @@ public class SpendOtherManaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Adriana, Captain of the Guard", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/ConditionalAsThoughTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/ConditionalAsThoughTest.java index cabea5788c..ee43737c36 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/ConditionalAsThoughTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/ConditionalAsThoughTest.java @@ -65,7 +65,6 @@ public class ConditionalAsThoughTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } @Test(expected = IllegalArgumentException.class) @@ -131,6 +130,5 @@ public class ConditionalAsThoughTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/FaceOfDivinityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/FaceOfDivinityTest.java index 026e4e6992..6603074327 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/FaceOfDivinityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/FaceOfDivinityTest.java @@ -40,6 +40,5 @@ public class FaceOfDivinityTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/LegendarySorceryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/LegendarySorceryTest.java index 48fbb6d514..1aaf57d219 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/LegendarySorceryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/LegendarySorceryTest.java @@ -57,7 +57,6 @@ public class LegendarySorceryTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Urza's Ruinous Blast", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/ManaWasSpentToCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/ManaWasSpentToCastTest.java index 51e6d5acac..7806f01c74 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/ManaWasSpentToCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/ManaWasSpentToCastTest.java @@ -5,7 +5,6 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.counters.CounterType; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -103,7 +102,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertTapped("Silvercoat Lion", true); } @@ -119,7 +117,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Jaded Sell-Sword", FirstStrikeAbility.getInstance(), true); assertAbility(playerA, "Jaded Sell-Sword", HasteAbility.getInstance(), true); @@ -134,7 +131,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Jaded Sell-Sword", FirstStrikeAbility.getInstance(), false); assertAbility(playerA, "Jaded Sell-Sword", HasteAbility.getInstance(), false); @@ -151,7 +147,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Verazol, the Split Current", CounterType.P1P1, 4); assertPowerToughness(playerA, "Verazol, the Split Current", 4, 4); @@ -170,7 +165,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Kobolds of Kher Keep", 7); } @@ -187,7 +181,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Pyretic Ritual", 1); assertPermanentCount(playerA, "Gray Ogre", 1); @@ -212,7 +205,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Isochron Scepter", true); assertExileCount(playerA, "Pyretic Ritual", 1); @@ -235,7 +227,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Mana Drain", 1); assertGraveyardCount(playerA, "Gray Ogre", 1); @@ -265,7 +256,6 @@ public class ManaWasSpentToCastTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Isochron Scepter", true); assertExileCount(playerA, "Mana Drain", 1); 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 38894410d4..709a87683d 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 @@ -89,7 +89,6 @@ public class TwoFacedCardEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 2); assertHandCount(playerB, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java index bf6c3e8ee1..e23bb86fd4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java @@ -95,7 +95,6 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Angel of Jubilation", 0); assertPermanentCount(playerB, "Food Chain", 0); @@ -215,8 +214,6 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerB, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Silvercoat Lion", 1); @@ -248,7 +245,5 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - - } + } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AuratouchedMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AuratouchedMageTest.java index 590ce9b6a7..4327954dc6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AuratouchedMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AuratouchedMageTest.java @@ -21,6 +21,5 @@ public class AuratouchedMageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ChangelingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ChangelingTest.java index 24f93f0cd5..da2a708559 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ChangelingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ChangelingTest.java @@ -103,7 +103,6 @@ public class ChangelingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, cohort, CounterType.P1P1, 1); assertCounterCount(playerA, "Shapeshifter Token", CounterType.P1P1, 1); @@ -123,7 +122,6 @@ public class ChangelingTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(amoeboid, true); assertPowerToughness(playerA, "Shapeshifter Token", 2, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommanderAsIndomitableCreativityCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommanderAsIndomitableCreativityCastTest.java index 2fbc9fb55c..1c5b1e54ea 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommanderAsIndomitableCreativityCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommanderAsIndomitableCreativityCastTest.java @@ -38,7 +38,6 @@ public class CommanderAsIndomitableCreativityCastTest extends CardTestCommander4 setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -60,7 +59,6 @@ public class CommanderAsIndomitableCreativityCastTest extends CardTestCommander4 setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java index 10d8fb721c..4bb538c619 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java @@ -28,7 +28,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCommandZoneCount(playerA, "Balduvian Bears", 0); assertPermanentCount(playerA, "Balduvian Bears", 1); @@ -64,7 +63,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCommandZoneCount(playerA, "Balduvian Bears", 0); assertPermanentCount(playerA, "Balduvian Bears", 1); @@ -83,7 +81,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCommandZoneCount(playerA, "Academy Ruins", 0); assertPermanentCount(playerA, "Academy Ruins", 1); @@ -122,7 +119,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(5, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCommandZoneCount(playerA, "Academy Ruins", 0); assertPermanentCount(playerA, "Academy Ruins", 1); @@ -156,7 +152,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -185,7 +180,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -226,7 +220,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(9, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -248,7 +241,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -271,7 +263,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -319,7 +310,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCommandZoneCount(playerA, "Balduvian Bears", 1); } @@ -375,7 +365,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -484,7 +473,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(13, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -540,7 +528,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -577,7 +564,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -606,7 +592,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 + 3); assertPermanentCount(playerA, "Swamp", 1); @@ -634,7 +619,6 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCommandZoneCount(playerA, "Balduvian Bears", 0); assertPermanentCount(playerA, "Balduvian Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersGameRestartTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersGameRestartTest.java index 56d19fed39..9efb951432 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersGameRestartTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersGameRestartTest.java @@ -49,7 +49,6 @@ public class CommandersGameRestartTest extends CardTestCommander4PlayersWithAIHe setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); // check watcher after restart UUID commanderId = currentGame.getCommandersIds(playerA, CommanderCardType.ANY, false).stream().findFirst().orElse(null); @@ -98,6 +97,5 @@ public class CommandersGameRestartTest extends CardTestCommander4PlayersWithAIHe setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConcurrentModificationExceptionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConcurrentModificationExceptionTest.java index 2754728439..5a6cc71a0e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConcurrentModificationExceptionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConcurrentModificationExceptionTest.java @@ -46,6 +46,5 @@ public class ConcurrentModificationExceptionTest extends CardTestPlayerBaseWithA //setStrictChooseMode(true); // need AI while cards adding setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalCostModificationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalCostModificationTest.java index 71a9242073..37b4bf58e4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalCostModificationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalCostModificationTest.java @@ -34,7 +34,6 @@ public class ConditionalCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTappedCount("Mountain", true, 2); assertTappedCount("Mountain", false, 0); @@ -53,7 +52,6 @@ public class ConditionalCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTappedCount("Mountain", true, 1); assertTappedCount("Mountain", false, 1); @@ -78,7 +76,6 @@ public class ConditionalCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTappedCount("Mountain", true, 1); assertTappedCount("Mountain", false, 1); @@ -103,7 +100,6 @@ public class ConditionalCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTappedCount("Mountain", true, 2); assertTappedCount("Mountain", false, 0); @@ -131,7 +127,6 @@ public class ConditionalCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTappedCount("Mountain", true, 4); assertTappedCount("Mountain", false, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalPreventionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalPreventionTest.java index ba5f93d7d8..ed2c429bdb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalPreventionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ConditionalPreventionTest.java @@ -31,7 +31,6 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 0); assertHandCount(playerA, "Lightning Bolt", 0); @@ -50,7 +49,6 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); assertHandCount(playerA, "Lightning Bolt", 0); @@ -75,7 +73,6 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); assertHandCount(playerA, "Lightning Bolt", 0); @@ -100,7 +97,6 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 0); assertHandCount(playerA, "Lightning Bolt", 0); @@ -127,7 +123,6 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 0); // not prevented, dies assertLife(playerA, 20); // prevented, no damage @@ -152,7 +147,6 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(4, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); assertPermanentCount(playerB, "Balduvian Bears", 1); @@ -183,7 +177,6 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(4, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 0); assertPermanentCount(playerB, "Balduvian Bears", 1); @@ -223,7 +216,6 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -261,6 +253,5 @@ public class ConditionalPreventionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java index bd3f57f592..fddc43d8fc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java @@ -38,7 +38,6 @@ public class DependentEffectsTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Enchanted Evening", 5, 5); assertPowerToughness(playerA, "War Horn", 3, 3); @@ -83,7 +82,6 @@ public class DependentEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Enchanted Evening"); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Rite of Replication", 1); assertGraveyardCount(playerB, "Raise the Alarm", 1); @@ -139,7 +137,6 @@ public class DependentEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Yixlid Jailer", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EndOfTurnMultiOpponentsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EndOfTurnMultiOpponentsTest.java index 4a981b0006..b60a1960ba 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EndOfTurnMultiOpponentsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EndOfTurnMultiOpponentsTest.java @@ -58,7 +58,6 @@ public class EndOfTurnMultiOpponentsTest extends CardTestMultiPlayerBaseWithRang setStopAt(12, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -104,7 +103,6 @@ public class EndOfTurnMultiOpponentsTest extends CardTestMultiPlayerBaseWithRang setStopAt(12, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -150,7 +148,6 @@ public class EndOfTurnMultiOpponentsTest extends CardTestMultiPlayerBaseWithRang setStopAt(12, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } // leaved players @@ -204,7 +201,6 @@ public class EndOfTurnMultiOpponentsTest extends CardTestMultiPlayerBaseWithRang setStopAt(5, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EndOfTurnOneOpponentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EndOfTurnOneOpponentTest.java index 04afbed368..2de3a42086 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EndOfTurnOneOpponentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EndOfTurnOneOpponentTest.java @@ -76,7 +76,6 @@ public class EndOfTurnOneOpponentTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -98,7 +97,6 @@ public class EndOfTurnOneOpponentTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -120,6 +118,5 @@ public class EndOfTurnOneOpponentTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GainAbilityDependenciesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GainAbilityDependenciesTest.java index a8e4fcb660..9480afae66 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GainAbilityDependenciesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GainAbilityDependenciesTest.java @@ -2,7 +2,6 @@ package org.mage.test.cards.continuous; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; -import mage.abilities.keyword.ChangelingAbility; import mage.abilities.keyword.HasteAbility; import mage.constants.*; import mage.counters.CounterType; @@ -90,6 +89,5 @@ public class GainAbilityDependenciesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GideonBlackbladeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GideonBlackbladeTest.java index 9f1baf27a7..8137f06eb1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GideonBlackbladeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GideonBlackbladeTest.java @@ -34,6 +34,5 @@ public class GideonBlackbladeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GideonJuraAndRowanKenrithNextTurnTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GideonJuraAndRowanKenrithNextTurnTest.java index 3cdd9a3afe..a526fb3c0e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GideonJuraAndRowanKenrithNextTurnTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GideonJuraAndRowanKenrithNextTurnTest.java @@ -27,7 +27,6 @@ public class GideonJuraAndRowanKenrithNextTurnTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -47,6 +46,5 @@ public class GideonJuraAndRowanKenrithNextTurnTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java index 6dedb8edf2..91bf96d04d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java @@ -26,7 +26,6 @@ public class GoblinBushwhackerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Elite Vanguard", 1); assertPowerToughness(playerA, "Elite Vanguard", 3, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/IrencragFeatTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/IrencragFeatTest.java index 3ebb83bc4c..944d747962 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/IrencragFeatTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/IrencragFeatTest.java @@ -34,7 +34,6 @@ public class IrencragFeatTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Dwarven Trader", 1); assertPermanentCount(playerA, "Dwarven Trader", 1); @@ -72,7 +71,6 @@ public class IrencragFeatTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Dwarven Trader", 1); assertPermanentCount(playerA, "Dwarven Trader", 3); @@ -94,7 +92,6 @@ public class IrencragFeatTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Lightning Bolt", 0); assertLife(playerB, 20 - 4 * 3); @@ -124,7 +121,6 @@ public class IrencragFeatTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Lightning Bolt", 4 - 3); assertLife(playerB, 20 - 3 * 3); @@ -146,7 +142,6 @@ public class IrencragFeatTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Dwarven Trader", 0); assertPermanentCount(playerA, "Dwarven Trader", 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java index eb4ca3ef0d..51749e04da 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java @@ -42,7 +42,6 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Chromatic Lantern", 1); @@ -69,7 +68,6 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Chromatic Lantern", 1); assertPermanentCount(playerA, "Magus of the Moon", 1); @@ -103,7 +101,6 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Aquitect's Will", 1); @@ -136,7 +133,6 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, bloodmoon, 1); assertPermanentCount(playerA, urborgtoy, 1); @@ -167,7 +163,6 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, bloodmoon, 1); assertPermanentCount(playerA, urborgtoy, 1); @@ -213,7 +208,6 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, urborgtoy, 1); assertPermanentCount(playerA, "Kormus Bell", 1); @@ -257,7 +251,6 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); Permanent darksteel = getPermanent("Darksteel Citadel", playerA.getId()); Assert.assertNotNull(darksteel); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LayerTests.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LayerTests.java index af0e70cef3..15e5e8a850 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LayerTests.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LayerTests.java @@ -41,7 +41,6 @@ public class LayerTests extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertType("Swamp", CardType.LAND, SubType.ADVISOR); // Subtype changed with Conspiracy assertPowerToughness(playerA, "Swamp", 1, 1); // boosted with Glorious Anthem @@ -76,7 +75,6 @@ public class LayerTests extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); // everything dies assertPermanentCount(playerA, "Humility", 0); @@ -224,7 +222,6 @@ public class LayerTests extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); // all lands are forests in addition to other types assertType("Plains", CardType.CREATURE, SubType.FOREST); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MartyrsOfKorlisTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MartyrsOfKorlisTest.java index 6cb3214d4f..a62da87af0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MartyrsOfKorlisTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MartyrsOfKorlisTest.java @@ -37,6 +37,5 @@ public class MartyrsOfKorlisTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java index e393254759..817551adfe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java @@ -49,7 +49,6 @@ public class MerfolkTricksterTest extends CardTestPlayerBase { flashAbility.add(FlashAbility.getInstance()); assertAbilities(playerB, mTrickster, flashAbility); // has flash - assertAllCommandsUsed(); } @Test @@ -72,7 +71,6 @@ public class MerfolkTricksterTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Flying Men", 1); assertPermanentCount(playerB, mTrickster, 1); assertDamageReceived(playerB, mTrickster, 1); - assertAllCommandsUsed(); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/OracleEnVecNextTurnTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/OracleEnVecNextTurnTest.java index 3abbaaae75..47aa71944e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/OracleEnVecNextTurnTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/OracleEnVecNextTurnTest.java @@ -51,6 +51,5 @@ public class OracleEnVecNextTurnTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PaintersServantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PaintersServantTest.java index 7b6c33d264..47d0835440 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PaintersServantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PaintersServantTest.java @@ -259,8 +259,7 @@ public class PaintersServantTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, "Pyroblast", 1); assertGraveyardCount(playerB, "Altar's Light", 1); assertLibraryCount(playerB, "Green Sun's Zenith", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PlayerLeavesGameTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PlayerLeavesGameTest.java index e5d710d3a0..f93504d73d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PlayerLeavesGameTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PlayerLeavesGameTest.java @@ -41,7 +41,6 @@ public class PlayerLeavesGameTest extends CardTestMultiPlayerBaseWithRangeAll { setStopAt(4, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -68,7 +67,6 @@ public class PlayerLeavesGameTest extends CardTestMultiPlayerBaseWithRangeAll { setStopAt(4, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } private void prepareAndRunLeaveGameWithLongEffectTest(Duration duration) { @@ -105,7 +103,6 @@ public class PlayerLeavesGameTest extends CardTestMultiPlayerBaseWithRangeAll { setStopAt(4, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -152,7 +149,6 @@ public class PlayerLeavesGameTest extends CardTestMultiPlayerBaseWithRangeAll { setStopAt(2, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @@ -184,7 +180,6 @@ public class PlayerLeavesGameTest extends CardTestMultiPlayerBaseWithRangeAll { setStopAt(5, PhaseStep.CLEANUP); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PraetorsGraspTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PraetorsGraspTest.java index 477b208390..e6c23de5be 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PraetorsGraspTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PraetorsGraspTest.java @@ -26,7 +26,6 @@ public class PraetorsGraspTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Praetor's Grasp", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java index 3afca6ea16..6d026e047f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java @@ -36,7 +36,6 @@ public class PsychicIntrusionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Psychic Intrusion", 1); assertHandCount(playerB, "Elspeth, Sun's Champion", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ShinenOfLifesRoarTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ShinenOfLifesRoarTest.java index a3b7a67b9a..3cfc2603dc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ShinenOfLifesRoarTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ShinenOfLifesRoarTest.java @@ -21,7 +21,6 @@ public class ShinenOfLifesRoarTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Shinen of Life's Roar", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SplitSecondTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SplitSecondTest.java index a5faf47426..5b75618786 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SplitSecondTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SplitSecondTest.java @@ -25,7 +25,6 @@ public class SplitSecondTest extends CardTestPlayerBase { // TODO: Needed, see https://github.com/magefree/mage/issues/8973 try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -55,7 +54,6 @@ public class SplitSecondTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 2 - 2); assertPermanentCount(playerA, "Raging Goblin", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java index c051c66dc1..598cd0ae3a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java @@ -485,7 +485,6 @@ public class SubTypeChangingEffectsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertDamageReceived(playerA, "Bonebreaker Giant", 3); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java index d1a814515b..863304ee0a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java @@ -29,7 +29,6 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Nyxbloom Ancient", 1); assertPermanentCount(playerA, "Chlorophant", 1); @@ -64,7 +63,6 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Nyxbloom Ancient", 2); assertPermanentCount(playerA, "Chlorophant", 1); @@ -86,7 +84,6 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -106,7 +103,6 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Chrome Mox", 1); assertExileCount(playerA, "Balduvian Bears", 1); @@ -124,7 +120,6 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -147,7 +142,6 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Chrome Mox", 1); assertExileCount(playerA, "Balduvian Bears", 1); @@ -169,7 +163,6 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -191,6 +184,5 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UnboundFlourishingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UnboundFlourishingTest.java index 5017e677c3..7fe96d2e75 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UnboundFlourishingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UnboundFlourishingTest.java @@ -37,7 +37,6 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -57,7 +56,6 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -80,7 +78,6 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -101,7 +98,6 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -122,7 +118,6 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -144,7 +139,6 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -167,7 +161,6 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -205,7 +198,6 @@ public class UnboundFlourishingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } } \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UntilNextEndStepTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UntilNextEndStepTest.java index 8578b05557..28947ca8f3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UntilNextEndStepTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/UntilNextEndStepTest.java @@ -29,7 +29,6 @@ public class UntilNextEndStepTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(endTurnNum, endPhaseStep); execute(); - assertAllCommandsUsed(); int powerToughness = stillActive ? 2 : 1; assertPowerToughness(playerA, "tester", powerToughness, powerToughness); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/VraskaTheUnseenNextTurnTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/VraskaTheUnseenNextTurnTest.java index f23d35e852..ce24a69e54 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/VraskaTheUnseenNextTurnTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/VraskaTheUnseenNextTurnTest.java @@ -39,6 +39,5 @@ public class VraskaTheUnseenNextTurnTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WallOfDustNextTurnTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WallOfDustNextTurnTest.java index 612b356406..7940582728 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WallOfDustNextTurnTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/WallOfDustNextTurnTest.java @@ -61,6 +61,5 @@ public class WallOfDustNextTurnTest extends CardTestPlayerBase { setStopAt(6, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExchangeControlTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExchangeControlTest.java index b95b18e43f..1a4e4650b3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExchangeControlTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExchangeControlTest.java @@ -177,7 +177,6 @@ public class ExchangeControlTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { if (!e.getMessage().contains("Player PlayerB must have 0 actions but found 1")) { @@ -321,7 +320,6 @@ public class ExchangeControlTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Kiki-Jiki, Mirror Breaker", 1); assertPermanentCount(playerA, "Dwarven Trader", 1); // Original's exhange target diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlDiedCastAgainTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlDiedCastAgainTest.java index 43cf81ec55..f4bb096e2e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlDiedCastAgainTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlDiedCastAgainTest.java @@ -47,7 +47,6 @@ public class GainControlDiedCastAgainTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlOfOwnedCreaturesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlOfOwnedCreaturesTest.java index d5cc75e601..f49c61f186 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlOfOwnedCreaturesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/GainControlOfOwnedCreaturesTest.java @@ -47,8 +47,6 @@ public class GainControlOfOwnedCreaturesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Dubious Challenge", 1); assertPermanentCount(playerA, "Void Winnower", 1); assertPowerToughness(playerA, "Void Winnower", 11, 9); @@ -101,8 +99,6 @@ public class GainControlOfOwnedCreaturesTest extends CardTestPlayerBase { setStopAt(8, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Dubious Challenge", 1); assertPermanentCount(playerA, "Void Winnower", 1); assertPowerToughness(playerA, "Void Winnower", 12, 10); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/TakeControlWhileSearchingLibraryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/TakeControlWhileSearchingLibraryTest.java index 130a86f56a..39ee676487 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/TakeControlWhileSearchingLibraryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/TakeControlWhileSearchingLibraryTest.java @@ -42,7 +42,6 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } @Test @@ -87,7 +86,6 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } @Test @@ -128,7 +126,6 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } @Test @@ -183,7 +180,6 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } @Test @@ -210,7 +206,6 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } @Test @@ -246,7 +241,6 @@ public class TakeControlWhileSearchingLibraryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Balduvian Bears", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/AlteredEgoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/AlteredEgoTest.java index c7e875f52f..51603c9a47 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/AlteredEgoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/AlteredEgoTest.java @@ -28,7 +28,6 @@ public class AlteredEgoTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPowerToughness(playerA, "Silvercoat Lion", 5, 5); @@ -49,7 +48,6 @@ public class AlteredEgoTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Altered Ego", 0); assertGraveyardCount(playerA, "Altered Ego", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java index bc83383d6d..20412f8849 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java @@ -74,7 +74,6 @@ public class CleverImpersonatorTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Clever Impersonator", 0); assertCounterCount(playerB, "Liliana, Defiant Necromancer", CounterType.LOYALTY, 3); // 3 diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java index 415b4ce272..0ea639c077 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CloneTest.java @@ -221,7 +221,6 @@ public class CloneTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Adaptive Automaton", 1); Permanent original = getPermanent("Adaptive Automaton", playerA); @@ -277,9 +276,8 @@ public class CloneTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - + assertPermanentCount(playerA, "Terastodon", 0); assertPermanentCount(playerA, "Ixidron", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.java index 77b81a665c..561d164471 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.java @@ -57,7 +57,6 @@ public class CopyEnchantmentTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyPermanentSpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyPermanentSpellTest.java index 75ada0ac39..5f1c62d63c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyPermanentSpellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyPermanentSpellTest.java @@ -36,7 +36,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 2); } @@ -53,7 +52,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 1); assertPermanentCount(playerA, "Holy Strength", 2); @@ -72,7 +70,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Centaur Courser", 1); assertPowerToughness(playerA, "Centaur Courser", 1, 1); @@ -94,7 +91,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Bushwhacker", 2); assertPowerToughness(playerA, "Grizzly Bears", 4, 2); @@ -112,7 +108,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Aether Figment", 2); assertPowerToughness(playerA, "Aether Figment", 3, 3, Filter.ComparisonScope.All); @@ -131,7 +126,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Reckless Bushwhacker", 2); assertPowerToughness(playerA, "Memnite", 3, 1, Filter.ComparisonScope.All); @@ -149,7 +143,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 1); assertPowerToughness(playerA, "Grizzly Bears", 6, 6); @@ -169,7 +162,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 1); assertPowerToughness(playerA, "Grizzly Bears", 4, 4); @@ -199,7 +191,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 0); assertGraveyardCount(playerA, "Grizzly Bears", 1); @@ -225,7 +216,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 0); assertGraveyardCount(playerA, "Grizzly Bears", 1); @@ -253,7 +243,6 @@ public class CopyPermanentSpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 0); assertGraveyardCount(playerA, "Grizzly Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java index 18ddef1fa2..9efcbb7ce2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java @@ -53,7 +53,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Silvercoat Lion", 1); assertHandCount(playerB, "Pillarfield Ox", 2); @@ -83,7 +82,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Angelic Blessing", 1); // original target @@ -120,7 +118,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Bonecrusher Giant", 4 + 2 * 2, 3 + 2 * 2); assertPowerToughness(playerA, "Grizzly Bears", 2, 2); @@ -152,7 +149,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Bonecrusher Giant", 4 + 2, 3 + 2); assertPowerToughness(playerA, "Grizzly Bears", 2 + 2, 2 + 2); @@ -184,7 +180,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Bonecrusher Giant", 4 + 2, 3 + 2); assertPowerToughness(playerA, "Grizzly Bears", 2 + 2, 2 + 2); @@ -421,7 +416,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Mountain", 1); assertPermanentCount(playerA, "Island", 1); @@ -480,7 +474,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3 * 2); // 2x bolts from 2x cascades } @@ -523,7 +516,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -576,7 +568,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -641,7 +632,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // counters checks int originalCounters = currentGame.getBattlefield().getAllActivePermanents().stream() @@ -781,7 +771,6 @@ public class CopySpellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Sol Ring", 2); // 1 taken by original, one by copy assertPermanentCount(playerB, "Sol Ring", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java index 9f17599783..b0762ff42c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java @@ -59,7 +59,6 @@ public class EssenceOfTheWildCopyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 0); assertPermanentCount(playerA, "Essence of the Wild", 2); @@ -84,7 +83,6 @@ public class EssenceOfTheWildCopyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 0); assertPermanentCount(playerA, "Essence of the Wild", 3); @@ -116,7 +114,6 @@ public class EssenceOfTheWildCopyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Soldier Token", 0); assertPermanentCount(playerA, "Essence of the Wild", 1 + 5); @@ -156,7 +153,6 @@ public class EssenceOfTheWildCopyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 0); assertPermanentCount(playerA, "Essence of the Wild", 2); @@ -190,7 +186,6 @@ public class EssenceOfTheWildCopyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Terror", 1); assertGraveyardCount(playerA, "Essence of the Wild", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildTest.java index 19d3072581..a7b65f66b2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildTest.java @@ -54,7 +54,6 @@ public class EssenceOfTheWildTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 0); assertPermanentCount(playerA, "Essence of the Wild", 2); @@ -79,7 +78,6 @@ public class EssenceOfTheWildTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 0); assertPermanentCount(playerA, "Essence of the Wild", 3); @@ -112,7 +110,6 @@ public class EssenceOfTheWildTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Silvercoat Lion", 0); assertPermanentCount(playerA, "Essence of the Wild", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FeldonOfTheThirdPathTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FeldonOfTheThirdPathTest.java index 4e4f13b750..6bd0e6e465 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FeldonOfTheThirdPathTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FeldonOfTheThirdPathTest.java @@ -48,7 +48,6 @@ public class FeldonOfTheThirdPathTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 22); // +2 from Robber assertLife(playerB, 18); // -2 from Robber @@ -75,7 +74,6 @@ public class FeldonOfTheThirdPathTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Feldon of the Third Path", 1); assertPermanentCount(playerA, "Sepulchral Primordial", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/IdentityThiefTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/IdentityThiefTest.java index 213a0637da..d9e902987a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/IdentityThiefTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/IdentityThiefTest.java @@ -38,7 +38,6 @@ public class IdentityThiefTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, 1); assertExileCount("Molten Sentry", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java index 4d215a9dd2..404310147c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java @@ -59,7 +59,6 @@ public class MimicVatTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertExileCount("Clone", 1); assertPermanentCount(playerB, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java index 248f7ad940..a25185fa60 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java @@ -624,8 +624,6 @@ public class PhantasmalImageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - Permanent staffA = getPermanent("Chimeric Staff", playerA); assertTrue("Phantasmal Image should be an artifact", staffA.isArtifact(currentGame)); assertTrue("Phantasmal Image should not be a creature", !staffA.isCreature(currentGame)); @@ -654,8 +652,6 @@ public class PhantasmalImageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - Permanent cloakA = getPermanent("Cloak and Dagger", playerA); assertTrue("Phantasmal Image should be an artifact", cloakA.isArtifact(currentGame)); assertTrue("Phantasmal Image should be tribal", cloakA.isTribal(currentGame)); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SharuumTheHegemonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SharuumTheHegemonTest.java index 41f4622355..af4ebcf8d0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SharuumTheHegemonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SharuumTheHegemonTest.java @@ -80,7 +80,6 @@ public class SharuumTheHegemonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 24); assertLife(playerB, 16); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SparkDoubleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SparkDoubleTest.java index e8b5bf9323..0e85d4afab 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SparkDoubleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SparkDoubleTest.java @@ -46,7 +46,6 @@ public class SparkDoubleTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Abbey Griffin", 2); @@ -72,7 +71,6 @@ public class SparkDoubleTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ajani, the Greathearted", 2); @@ -95,7 +93,6 @@ public class SparkDoubleTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Abbey Griffin", 2); @@ -123,7 +120,6 @@ public class SparkDoubleTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Gideon, Ally of Zendikar", 2); @@ -151,7 +147,6 @@ public class SparkDoubleTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Gideon Blackblade", 2); @@ -202,7 +197,6 @@ public class SparkDoubleTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); } @Test @@ -239,7 +233,6 @@ public class SparkDoubleTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); } @Test @@ -281,7 +274,6 @@ public class SparkDoubleTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java index f801943190..cff5670b4a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java @@ -38,7 +38,6 @@ public class VolrathsShapshifterTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Assault Griffin", 1); assertPowerToughness(playerA, "Assault Griffin", 3, 2); @@ -71,7 +70,6 @@ public class VolrathsShapshifterTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Volrath's Shapeshifter", 1); assertPowerToughness(playerA, "Volrath's Shapeshifter", 0, 1); @@ -100,7 +98,6 @@ public class VolrathsShapshifterTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Dutiful Thrull", 1); assertPowerToughness(playerA, "Dutiful Thrull", 1, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/RevealedOrControlledDragonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/RevealedOrControlledDragonTest.java index 04a5a806da..8a92a892b0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/RevealedOrControlledDragonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/additional/RevealedOrControlledDragonTest.java @@ -38,7 +38,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, lion, 1); assertGraveyardCount(playerA, roar, 1); @@ -56,7 +55,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, lion, 1); assertGraveyardCount(playerA, roar, 1); @@ -74,7 +72,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, lion, 1); assertGraveyardCount(playerA, roar, 1); @@ -92,7 +89,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, orator, 1); assertHandCount(playerA, 1 + 1); @@ -108,7 +104,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, orator, 1); assertHandCount(playerA, 1); @@ -124,7 +119,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, orator, 1); assertHandCount(playerA, 0); @@ -141,7 +135,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, sentinels, 1); assertCounterCount(playerA, sentinels, CounterType.P1P1, 1); @@ -157,7 +150,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, sentinels, 1); assertCounterCount(playerA, sentinels, CounterType.P1P1, 1); @@ -173,7 +165,6 @@ public class RevealedOrControlledDragonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, sentinels, 1); assertCounterCount(playerA, sentinels, CounterType.P1P1, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java index 73c2b8a2dd..d90e26f572 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java @@ -31,7 +31,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 1); @@ -53,7 +52,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 1); @@ -72,7 +70,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 0); @@ -94,7 +91,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 1); @@ -122,7 +118,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 1); @@ -143,7 +138,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 1); assertPermanentCount(playerA, "Food Token", 0); @@ -166,7 +160,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 1); assertPermanentCount(playerA, "Food Token", 1); @@ -186,7 +179,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 0); @@ -222,7 +214,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertExileCount(playerA, "Curious Pair", 0); @@ -245,7 +236,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 2); @@ -273,7 +263,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 2); @@ -303,7 +292,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 0); @@ -338,7 +326,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertHandCount(playerB, 0); @@ -381,7 +368,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Rimrock Knight", 2); @@ -401,7 +387,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Rimrock Knight", 1); @@ -447,7 +432,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, 4); @@ -472,7 +456,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Curious Pair", 0); assertLibraryCount(playerA, 1); @@ -498,7 +481,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 0); @@ -522,7 +504,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Food Token", 0); assertLibraryCount(playerA, 1); @@ -556,7 +537,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 1); @@ -590,7 +570,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, 3); @@ -614,7 +593,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } @Test @@ -633,7 +611,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } @Test @@ -652,7 +629,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } @Test @@ -671,7 +647,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } @Test @@ -710,7 +685,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } @Test @@ -764,7 +738,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -790,7 +763,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Curious Pair", 0); assertPermanentCount(playerA, "Food Token", 1); @@ -819,7 +791,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Flaxen Intruder", 1); assertPermanentCount(playerA, "Bear", 0); @@ -838,7 +809,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Curious Pair", 0); assertPermanentCount(playerA, "Food Token", 1); @@ -858,7 +828,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Flaxen Intruder", 1); assertPermanentCount(playerA, "Bear", 0); @@ -877,7 +846,6 @@ public class AdventureCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Lonesome Unicorn", 0); assertPermanentCount(playerA, "Knight Token", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/BolassCitadelTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/BolassCitadelTest.java index d43766a822..6f6a7d0a16 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/BolassCitadelTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/BolassCitadelTest.java @@ -24,7 +24,6 @@ public class BolassCitadelTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Eager Cadet", 1); assertGraveyardCount(playerA, 0); @@ -51,7 +50,6 @@ public class BolassCitadelTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertPermanentCount(playerA, "Food Token", 1); assertExileCount(playerA, "Curious Pair", 1); @@ -72,7 +70,6 @@ public class BolassCitadelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Fellwar Stone", 1); assertLife(playerA, 20 - 2); @@ -94,7 +91,6 @@ public class BolassCitadelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Archfiend of Ifnir", 1); assertLife(playerA, 20 - 5); @@ -123,7 +119,6 @@ public class BolassCitadelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Giant Killer", 1); assertGraveyardCount(playerA, "Ferocious Zheng", 1); @@ -157,6 +152,5 @@ public class BolassCitadelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java index 7d482b1f8e..2cb8db0748 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java @@ -3,7 +3,6 @@ package org.mage.test.cards.cost.alternate; import mage.abilities.keyword.DoubleStrikeAbility; import mage.constants.PhaseStep; import mage.constants.Zone; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -227,9 +226,7 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - - assertHandCount(playerA, "Silvercoat Lion", 1); + assertHandCount(playerA, "Silvercoat Lion", 1); assertHandCount(playerB, 0); assertGraveyardCount(playerA, "Far // Away", 1); @@ -301,7 +298,6 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Barbed Lightning", 1); assertGraveyardCount(playerB, "Bog Wraith", 1); @@ -379,8 +375,6 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Omniscience", 1); assertPermanentCount(playerA, "Bog Wraith", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/UseAlternateSourceCostsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/UseAlternateSourceCostsTest.java index 91cde8b317..b22c520e1e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/UseAlternateSourceCostsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/UseAlternateSourceCostsTest.java @@ -28,8 +28,6 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - //Gray Ogre is cast with the discard assertPermanentCount(playerA, "Gray Ogre", 1); assertGraveyardCount(playerA, "Lightning Bolt", 1); @@ -99,7 +97,6 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Alpha Myr", 1); assertTappedCount("Plains", false, 3); // must discard 1 instead tap @@ -124,7 +121,6 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Alpha Myr", 1); } @@ -146,7 +142,6 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -164,8 +159,7 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, "Invigorate", 1); assertPowerToughness(playerA, "Silvercoat Lion", 6, 6); assertLife(playerB, 23); @@ -188,8 +182,7 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, "Invigorate", 1); assertPowerToughness(playerA, "Silvercoat Lion", 2, 2); assertLife(playerB, 20); @@ -203,6 +196,5 @@ public class UseAlternateSourceCostsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsInCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsInCommanderTest.java index 73826e2bf1..6922b8bd63 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsInCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsInCommanderTest.java @@ -64,7 +64,6 @@ public class ModalDoubleFacesCardsInCommanderTest extends CardTestCommanderDuelB setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); // possible bug: you can catch choose dialog for duplicated upkeep triggers - assertAllCommandsUsed(); } @Test @@ -85,7 +84,6 @@ public class ModalDoubleFacesCardsInCommanderTest extends CardTestCommanderDuelB setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java index 81fcd83b1c..b107cfd4e8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java @@ -52,7 +52,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -81,7 +80,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -105,7 +103,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -135,7 +132,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 6); // creature life pay instead mana } @@ -166,7 +162,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -195,7 +190,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -225,7 +219,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -252,7 +245,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); Assert.assertEquals(3, getHandCards(playerA).size()); @@ -286,7 +278,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); // possible bug: duplicated abilities list in main card Assert.assertEquals("must have only 2 play abilities", 2, playerA.getPlayable(currentGame, true).size()); @@ -329,7 +320,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Snapcaster Mage", 1); } @@ -349,7 +339,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); Card card = currentGame.getState().getBattlefield().getAllPermanents() .stream() @@ -382,7 +371,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); Card card = currentGame.getState().getBattlefield().getAllPermanents() @@ -422,7 +410,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); Card card = currentGame.getState().getExile().getAllCards(currentGame) .stream() @@ -474,7 +461,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -513,7 +499,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -553,7 +538,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -591,7 +575,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -629,7 +612,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -657,7 +639,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -678,7 +659,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 2); } @@ -712,7 +692,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 2); } @@ -752,7 +731,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Akoum Warrior", 1); } @@ -773,7 +751,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 + 2); // +2 from 1 etb trigger } @@ -798,7 +775,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -829,7 +805,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Valki, God of Lies", 1); } @@ -861,7 +836,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "The Omenkeel", 1); } @@ -879,7 +853,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Valki, God of Lies", 1); assertPermanentCount(playerA, "Servo Token", 3); @@ -898,7 +871,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "The Omenkeel", 1); assertPermanentCount(playerA, "Servo Token", 3); @@ -928,7 +900,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -955,7 +926,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -978,7 +948,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -1004,7 +973,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Valki, God of Lies", 0); assertPermanentCount(playerA, "Birgi, God of Storytelling", 1); @@ -1036,6 +1004,5 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java index cd8d37b1d4..470010f26e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostModificationTest.java @@ -70,7 +70,6 @@ public class CostModificationTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -119,7 +118,6 @@ public class CostModificationTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -284,7 +282,6 @@ public class CostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Grapeshot", 1); } @@ -318,7 +315,6 @@ public class CostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -357,7 +353,6 @@ public class CostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Engulfing Flames", 1); } @@ -398,7 +393,6 @@ public class CostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(6, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -454,7 +448,6 @@ public class CostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Vivien Reid", 1); assertGraveyardCount(playerA, "Huatli, Warrior Poet", 1); @@ -494,6 +487,5 @@ public class CostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostReduceForEachTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostReduceForEachTest.java index 4c318e556e..1b2338a1d9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostReduceForEachTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostReduceForEachTest.java @@ -6,6 +6,7 @@ import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBaseWithAIHelps; + import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions; /** @@ -38,7 +39,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ancient Stone Idol", 1); } @@ -74,7 +74,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Ancient Stone Idol", 1); assertGraveyardCount(playerA, "Blood Pet", 2); @@ -102,7 +101,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Khalni Hydra", 1); } @@ -138,7 +136,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Torgaar, Famine Incarnate", 1); assertLife(playerB, 20 / 2); @@ -160,7 +157,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Alloy Myr", 1); } @@ -183,7 +179,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Shower of Coals", 1); } @@ -214,7 +209,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); } @@ -232,7 +226,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); @@ -266,7 +259,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); } @@ -288,7 +280,6 @@ public class CostReduceForEachTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Keeper of Tresserhorn", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostReduceWithConditionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostReduceWithConditionTest.java index 7ab2978d83..7b4a3ca9ee 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostReduceWithConditionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/CostReduceWithConditionTest.java @@ -24,7 +24,6 @@ public class CostReduceWithConditionTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Balduvian Bears", 1); } @@ -45,7 +44,6 @@ public class CostReduceWithConditionTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Anje Falkenrath", 1); } @@ -67,7 +65,6 @@ public class CostReduceWithConditionTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Anje Falkenrath", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/FerventChampionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/FerventChampionTest.java index b74dfe0b12..85098fe305 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/FerventChampionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/FerventChampionTest.java @@ -32,8 +32,6 @@ public class FerventChampionTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, "Fervent Champion", 3,3); } } \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/KaradorGhostChieftainTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/KaradorGhostChieftainTest.java index 0a77d8d8ae..5d8e357aa8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/KaradorGhostChieftainTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/KaradorGhostChieftainTest.java @@ -27,7 +27,6 @@ public class KaradorGhostChieftainTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Karador, Ghost Chieftain"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Karador, Ghost Chieftain", 1); } @@ -55,7 +54,6 @@ public class KaradorGhostChieftainTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Karador, Ghost Chieftain"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Karador, Ghost Chieftain", 1); } @@ -85,8 +83,6 @@ public class KaradorGhostChieftainTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Silvercoat Lion", 2); assertGraveyardCount(activePlayer, "Cloudshift", 1); @@ -135,7 +131,6 @@ public class KaradorGhostChieftainTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MonohybridCostReduceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MonohybridCostReduceTest.java index cdd7b3a560..1e510903cc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MonohybridCostReduceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MonohybridCostReduceTest.java @@ -27,6 +27,5 @@ public class MonohybridCostReduceTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MonohybridManaPayTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MonohybridManaPayTest.java index 379067302e..f7ef835e6f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MonohybridManaPayTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/MonohybridManaPayTest.java @@ -31,7 +31,6 @@ public class MonohybridManaPayTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); } @@ -68,7 +67,6 @@ public class MonohybridManaPayTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Reaper King", 1); } @@ -105,7 +103,6 @@ public class MonohybridManaPayTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Reaper King", 1); } @@ -140,7 +137,6 @@ public class MonohybridManaPayTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Reaper King", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/PayDelveFromCommandZoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/PayDelveFromCommandZoneTest.java index 797e35260a..921624586e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/PayDelveFromCommandZoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/PayDelveFromCommandZoneTest.java @@ -28,7 +28,6 @@ public class PayDelveFromCommandZoneTest extends CardTestCommander4Players { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Tasigur, the Golden Fang", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java index f3dfbbd34f..c3b7c3c191 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java @@ -41,7 +41,6 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Mindclaw Shaman", 1); assertGraveyardCount(playerB, "Wear // Tear", 1); @@ -73,7 +72,6 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Mindclaw Shaman", 1); assertGraveyardCount(playerB, "Wear // Tear", 1); @@ -106,7 +104,6 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Mindclaw Shaman", 1); assertGraveyardCount(playerB, "Wear // Tear", 1); @@ -140,7 +137,6 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 14); assertGraveyardCount(playerA, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardsTest.java index 5566dc54f4..97741c898d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardsTest.java @@ -36,7 +36,6 @@ public class SplitCardsTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 22); assertLife(playerB, 18); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/damage/ExcessDamageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/damage/ExcessDamageTest.java index b0ab321223..c06ced4ac0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/damage/ExcessDamageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/damage/ExcessDamageTest.java @@ -31,7 +31,6 @@ public class ExcessDamageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, bear, 1); assertPermanentCount(playerA, bear, 0); @@ -51,7 +50,6 @@ public class ExcessDamageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, bear, 1); assertPermanentCount(playerA, bear, 0); @@ -70,7 +68,6 @@ public class ExcessDamageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, bear, 1); assertPermanentCount(playerA, bear, 0); @@ -88,7 +85,6 @@ public class ExcessDamageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, myr, 0); assertPermanentCount(playerA, myr, 1); @@ -111,7 +107,6 @@ public class ExcessDamageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, gideon, 1); assertPermanentCount(playerA, gideon, 0); @@ -130,7 +125,6 @@ public class ExcessDamageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 1); assertGraveyardCount(playerA, bolt, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/digital/ConjureTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/digital/ConjureTest.java index 578f2c2413..f774437c92 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/digital/ConjureTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/digital/ConjureTest.java @@ -26,7 +26,6 @@ public class ConjureTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, trainer, 1); assertHandCount(playerA, pegasus, 1); @@ -43,7 +42,6 @@ public class ConjureTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, trainer, 1); assertPermanentCount(playerA, pegasus, 1); @@ -62,7 +60,6 @@ public class ConjureTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, skeleton, 2); assertGraveyardCount(playerA, murder, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/digital/SeekTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/digital/SeekTest.java index 2f27ba0396..912721115c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/digital/SeekTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/digital/SeekTest.java @@ -24,7 +24,6 @@ public class SeekTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lookout, 1); assertHandCount(playerA, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java index 9fb16de613..548ecea0a7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java @@ -86,7 +86,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); assertPermanentCount(playerA, "Goblin Token", 0); @@ -109,7 +108,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); assertPermanentCount(playerA, "Goblin Token", 1); @@ -135,7 +133,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); assertPermanentCount(playerA, "Goblin Token", 1); @@ -163,7 +160,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); assertPermanentCount(playerA, "Goblin Token", 1); @@ -187,7 +183,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(null, null); @@ -211,7 +206,6 @@ public class DungeonTest extends CardTestPlayerBase { rollbackTurns(2, PhaseStep.END_TURN, playerA, 0); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(LOST_MINE_OF_PHANDELVER, "Goblin Lair"); @@ -243,7 +237,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, SILVERCOAT_LION, 3, 3); assertCounterCount(playerA, SILVERCOAT_LION, CounterType.P1P1, 1); @@ -282,7 +275,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); assertPowerToughness(playerB, FLAMESPEAKER_ADEPT, 2 + 2 + 2, 3); @@ -314,7 +306,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, GLOOM_STALKER, DoubleStrikeAbility.getInstance(), true); assertDungeonRoom(null, null); @@ -326,7 +317,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, GLOOM_STALKER, DoubleStrikeAbility.getInstance(), false); assertDungeonRoom(null, null); @@ -355,7 +345,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, GLOOM_STALKER, DoubleStrikeAbility.getInstance(), true); assertDungeonRoom(null, null); @@ -380,7 +369,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, DUNGEON_CRAWLER, 1); assertDungeonRoom(null, null); @@ -403,7 +391,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2 + 2, 3); assertPermanentCount(playerA, "Goblin Token", 2); @@ -430,7 +417,6 @@ public class DungeonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); assertPermanentCount(playerA, "Goblin Token", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/PartyCountTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/PartyCountTest.java index 10ce077171..f12e5f81d6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/PartyCountTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/PartyCountTest.java @@ -57,7 +57,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); } @@ -71,7 +70,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 21); } @@ -85,7 +83,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 21); } @@ -100,7 +97,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 22); } @@ -115,7 +111,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 21); } @@ -131,7 +126,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 23); } @@ -147,7 +141,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 23); } @@ -164,7 +157,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 24); } @@ -180,7 +172,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 21); @@ -196,7 +187,6 @@ public class PartyCountTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 23); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/SweepTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/SweepTest.java index e430494e4b..797c9b80d2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/SweepTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/SweepTest.java @@ -91,7 +91,6 @@ public class SweepTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Raging Goblin", 1); assertPermanentCount(playerA, "Plains", 5); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AnimateDeadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AnimateDeadTest.java index 37acd207c0..a7d5c93fee 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AnimateDeadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AnimateDeadTest.java @@ -195,8 +195,6 @@ public class AnimateDeadTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/ClassTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/ClassTest.java index b3f1ff9c86..cd7a4743f1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/ClassTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/ClassTest.java @@ -36,7 +36,6 @@ public class ClassTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertClassLevel(wizard, 1); assertHandCount(playerA, 0); @@ -51,7 +50,6 @@ public class ClassTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertClassLevel(wizard, 2); assertHandCount(playerA, 2); @@ -68,7 +66,6 @@ public class ClassTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertClassLevel(wizard, 3); assertHandCount(playerA, 3); @@ -80,7 +77,6 @@ public class ClassTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, druid); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertClassLevel(druid, 1); assertHandCount(playerA, 0); } @@ -97,7 +93,6 @@ public class ClassTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertClassLevel(druid, 2); assertHandCount(playerA, 0); @@ -120,7 +115,6 @@ public class ClassTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertClassLevel(druid, 3); assertHandCount(playerA, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java index d7f83aee67..c0e5a4bd93 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java @@ -43,7 +43,6 @@ public class NestOfScarabsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, nestScarabs, 1); assertPermanentCount(playerA, stinger, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java index 4789747d90..53697ba08f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java @@ -30,7 +30,6 @@ public class OathOfLiegesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 4 + 1); assertPermanentCount(playerB, "Island", 5); @@ -62,7 +61,6 @@ public class OathOfLiegesTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 5); assertPermanentCount(playerB, "Plains", 4 + 1); @@ -86,7 +84,6 @@ public class OathOfLiegesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 4 + 1); assertPermanentCount(playerB, "Plains", 5); @@ -115,7 +112,6 @@ public class OathOfLiegesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 3 + 2); assertPermanentCount(playerB, "Plains", 5); @@ -171,7 +167,6 @@ public class OathOfLiegesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 10 + 2); assertPermanentCount(playerB, "Plains", 12); @@ -222,7 +217,6 @@ public class OathOfLiegesTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 10 + 2); assertPermanentCount(playerB, "Plains", 12); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagaTest.java index c1c0f73508..1e297c87e6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagaTest.java @@ -39,7 +39,6 @@ public class SagaTest extends CardTestPlayerBase { setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, rite, 1); assertPermanentCount(playerA, rite, 0); @@ -70,7 +69,6 @@ public class SagaTest extends CardTestPlayerBase { castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, flicker, rite); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, rite, 0); assertPermanentCount(playerA, rite, 1); @@ -102,7 +100,6 @@ public class SagaTest extends CardTestPlayerBase { castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, boomerang, rite); setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, rite, 1); assertPermanentCount(playerA, rite, 0); @@ -126,7 +123,6 @@ public class SagaTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, rite, 1); assertPermanentCount(playerA, rite, 0); @@ -151,7 +147,6 @@ public class SagaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, saga, 0); assertGraveyardCount(playerA, saga, 1); @@ -175,7 +170,6 @@ public class SagaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, saga, 0); assertGraveyardCount(playerA, saga, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/StarfieldOfNyxTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/StarfieldOfNyxTest.java index 3f95501f20..ce55d4fe38 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/StarfieldOfNyxTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/StarfieldOfNyxTest.java @@ -49,7 +49,6 @@ public class StarfieldOfNyxTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Thopter Spy Network", 0); assertPowerToughness(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), @@ -116,7 +115,6 @@ public class StarfieldOfNyxTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Master of the Feast", 3, 3, Filter.ComparisonScope.All); assertPowerToughness(playerA, "Humility", 4, 4, Filter.ComparisonScope.All); @@ -162,7 +160,6 @@ public class StarfieldOfNyxTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Always Watching", 5); assertPermanentCount(playerB, "Song of the Dryads", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/BaneAlleyBrokerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/BaneAlleyBrokerTest.java index d02e058460..ed41291467 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/BaneAlleyBrokerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/BaneAlleyBrokerTest.java @@ -33,7 +33,6 @@ public class BaneAlleyBrokerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 2); assertHandCount(playerA, "Sejiri Merfolk", 1); @@ -65,7 +64,6 @@ public class BaneAlleyBrokerTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 4); assertHandCount(playerA, "Sejiri Merfolk", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/GrimHaruspexTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/GrimHaruspexTest.java index b3c43ade43..b5d412b409 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/GrimHaruspexTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/GrimHaruspexTest.java @@ -23,8 +23,6 @@ public class GrimHaruspexTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Grim Haruspex", 1); assertHandCount(playerA, 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/PrimordialMistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/PrimordialMistTest.java index 0167be3c33..de180da328 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/PrimordialMistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/PrimordialMistTest.java @@ -46,8 +46,6 @@ public class PrimordialMistTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertExileCount(playerA, 0); assertPowerToughness(playerA, "Brine Elemental", 5, 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/TriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/TriggerTest.java index 2a673dd635..b10fef1a3a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/facedown/TriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/facedown/TriggerTest.java @@ -1,11 +1,9 @@ package org.mage.test.cards.facedown; -import mage.cards.Card; import mage.constants.EmptyNames; import mage.constants.PhaseStep; import mage.constants.Zone; -import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -48,8 +46,6 @@ public class TriggerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerB, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Midnight Reaper", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/flip/SasayaOrochiAscendantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/flip/SasayaOrochiAscendantTest.java index ec2956d808..2ef951e3ca 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/flip/SasayaOrochiAscendantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/flip/SasayaOrochiAscendantTest.java @@ -7,6 +7,7 @@ import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; + import static org.mage.test.utils.ManaOptionsTestUtils.assertDuplicatedManaOptions; import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions; @@ -37,7 +38,6 @@ public class SasayaOrochiAscendantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Sasaya's Essence", 1); assertPermanentCount(playerA, "Upwelling", 1); @@ -72,7 +72,6 @@ public class SasayaOrochiAscendantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Sasaya's Essence", 1); assertPermanentCount(playerA, "Upwelling", 1); @@ -113,7 +112,6 @@ public class SasayaOrochiAscendantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Sasaya's Essence", 1); assertPermanentCount(playerA, "Upwelling", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/flipcoin/FlipCoinTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/flipcoin/FlipCoinTest.java index 6b183a428e..e5e6d7b013 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/flipcoin/FlipCoinTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/flipcoin/FlipCoinTest.java @@ -22,7 +22,6 @@ public class FlipCoinTest extends CardTestPlayerBase { //setStrictChooseMode(true); // normal play without errors setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } @Test(expected = AssertionError.class) @@ -37,7 +36,6 @@ public class FlipCoinTest extends CardTestPlayerBase { setStrictChooseMode(true); // no coinresult in choices, so it must fail setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } @Test @@ -62,7 +60,6 @@ public class FlipCoinTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(9, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Wirefly", 5); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/DoublingCubeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/DoublingCubeTest.java index 9c1db46601..f0f8f82968 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/DoublingCubeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/DoublingCubeTest.java @@ -7,6 +7,7 @@ import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; + import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions; public class DoublingCubeTest extends CardTestPlayerBase { @@ -38,7 +39,6 @@ public class DoublingCubeTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); assertManaPool(playerA, ManaType.COLORLESS, 4); - assertAllCommandsUsed(); } @Test @@ -53,9 +53,7 @@ public class DoublingCubeTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - - assertAllCommandsUsed(); - + ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 4, manaOptions.size()); assertManaOptions("{R}{R}{R}{R}{R}{R}{R}{R}{G}{G}", manaOptions); @@ -80,9 +78,7 @@ public class DoublingCubeTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.UPKEEP); execute(); - - assertAllCommandsUsed(); - + ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 138, manaOptions.size()); assertManaOptions("{C}{C}{C}{C}{C}{C}{C}{C}{R}{R}{R}{R}{R}{R}{R}{R}{R}{R}{R}{R}{R}{R}", manaOptions); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ExtraplanarLensTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ExtraplanarLensTest.java index dad94b266f..311f81f4a3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ExtraplanarLensTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ExtraplanarLensTest.java @@ -35,7 +35,6 @@ public class ExtraplanarLensTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lens, 1); assertExileCount(snow_covered_forest, 1); @@ -60,7 +59,6 @@ public class ExtraplanarLensTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lens, 1); assertExileCount(forest, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/GaeasGradleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/GaeasGradleTest.java index 1ebe08d9aa..4f62a859bf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/GaeasGradleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/GaeasGradleTest.java @@ -24,8 +24,6 @@ public class GaeasGradleTest extends CardTestPlayerBase { checkManaPool("gaeas cradle ",1, PhaseStep.PRECOMBAT_MAIN, playerA, "G", 2); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/HarvestMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/HarvestMageTest.java index b310add09c..82d7d5b740 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/HarvestMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/HarvestMageTest.java @@ -6,6 +6,7 @@ import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; + import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions; /** @@ -33,8 +34,6 @@ public class HarvestMageTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Harvest Mage", 1); ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); @@ -63,8 +62,6 @@ public class HarvestMageTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Harvest Mage", 1); ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaPoolTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaPoolTest.java index fdfaf0ea67..666e05427a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaPoolTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaPoolTest.java @@ -40,7 +40,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -62,7 +61,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -84,7 +82,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -109,7 +106,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -133,7 +129,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -164,7 +159,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -190,7 +184,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -222,7 +215,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -252,7 +244,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -281,7 +272,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -326,7 +316,6 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -372,6 +361,5 @@ public class ManaPoolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/MultipleTimesUsableActivatedManaAbilitiesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/MultipleTimesUsableActivatedManaAbilitiesTest.java index 83a9f0f0df..7bceebf8b0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/MultipleTimesUsableActivatedManaAbilitiesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/MultipleTimesUsableActivatedManaAbilitiesTest.java @@ -35,9 +35,7 @@ public class MultipleTimesUsableActivatedManaAbilitiesTest extends CardTestPlaye setStrictChooseMode(true); execute(); - - assertAllCommandsUsed(); - + assertTappedCount("Citanul Druid", true, 3); assertPermanentCount(playerA, "Leatherback Baloth", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/NonTappingManaAbilitiesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/NonTappingManaAbilitiesTest.java index b26e6dcafd..2fb4496195 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/NonTappingManaAbilitiesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/NonTappingManaAbilitiesTest.java @@ -7,6 +7,7 @@ import mage.counters.CounterType; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; + import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions; /** @@ -62,8 +63,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{C}{C}{C}{C}", manaOptions); @@ -80,8 +79,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{B}{B}{Any}{Any}{Any}{Any}", manaOptions); @@ -97,8 +94,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 5, manaOptions.size()); assertManaOptions("{W}{W}{W}{W}", manaOptions); @@ -120,8 +115,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{Any}{Any}", manaOptions); @@ -141,8 +134,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 3, manaOptions.size()); assertManaOptions("{G}", manaOptions); @@ -169,8 +160,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 3, manaOptions.size()); assertManaOptions("{G}", manaOptions); @@ -193,8 +182,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Wood", 3); ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); @@ -220,8 +207,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 9, manaOptions.size()); assertManaOptions("{C}{G}{G}{U}{U}{U}{R}{R}", manaOptions); @@ -248,8 +233,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{G}{G}{Any}{Any}", manaOptions); @@ -265,8 +248,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{R}{R}{R}{R}{R}{R}", manaOptions); @@ -283,8 +264,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{B}{B}{B}{B}", manaOptions); @@ -303,9 +282,7 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - - assertCounterCount("Mana Cache", CounterType.CHARGE, 2); + assertCounterCount("Mana Cache", CounterType.CHARGE, 2); ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); @@ -325,8 +302,6 @@ public class NonTappingManaAbilitiesTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertCounterCount("Mana Cache", CounterType.CHARGE, 2); ManaOptions manaOptions = playerB.getAvailableManaTest(currentGame); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java index c2e284bbe1..fa7304012b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java @@ -35,7 +35,6 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -60,7 +59,6 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -90,7 +88,6 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } // https://github.com/magefree/mage/issues/5206 @@ -118,7 +115,6 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } @Test @@ -144,7 +140,6 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } // Condescend {X}{U} @@ -179,6 +174,5 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/SylvokExplorerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/SylvokExplorerTest.java index 14a8c3f87d..8fb9d485b7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/SylvokExplorerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/SylvokExplorerTest.java @@ -24,7 +24,6 @@ public class SylvokExplorerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); ManaOptions options = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("Player should be able to create 1 red and 1 white mana", "{R}{W}", options.get(0).toString()); @@ -44,7 +43,6 @@ public class SylvokExplorerTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); ManaOptions options = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("Player should be able to create 3 white mana", "{W}{W}{W}", options.get(0).toString()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/TappedForManaRelatedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/TappedForManaRelatedTest.java index 1dfecf6823..0c8b035458 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/TappedForManaRelatedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/TappedForManaRelatedTest.java @@ -9,6 +9,7 @@ import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; + import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions; /** @@ -148,8 +149,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertCounterCount("Calciform Pools", CounterType.STORAGE, 2); ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); @@ -172,8 +171,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.UPKEEP); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 2, manaOptions.size()); assertManaOptions("{C}{R}", manaOptions); @@ -192,8 +189,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 4, manaOptions.size()); assertManaOptions("{C}{W}{W}", manaOptions); @@ -218,8 +213,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{Any}", manaOptions); @@ -235,8 +228,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{U}{U}{U}{U}", manaOptions); @@ -255,8 +246,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{C}{C}{C}{C}{C}", manaOptions); @@ -280,8 +269,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerB, "Giant Growth", 1); assertPowerToughness(playerA, "Viridian Joiner", 4, 5); @@ -304,8 +291,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); Assert.assertEquals("mana variations don't fit", 1, manaOptions.size()); assertManaOptions("{B}{B}{B}{B}{B}", manaOptions); @@ -331,8 +316,6 @@ public class TappedForManaRelatedTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - Permanent pp = getPermanent("Pili-Pala"); Assert.assertTrue("Pili-Pala has 1 attachment", pp.getAttachments().size() == 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java index b27ae4847f..ea5642751c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/ConditionalManaTest.java @@ -233,7 +233,6 @@ public class ConditionalManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Empowered Autogenerator", CounterType.CHARGE, 1); assertLife(playerB, 20 - 3); @@ -260,7 +259,6 @@ public class ConditionalManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Empowered Autogenerator", CounterType.CHARGE, 2); assertLife(playerB, 20 - 3); @@ -287,7 +285,6 @@ public class ConditionalManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Empowered Autogenerator", CounterType.CHARGE, 2); assertLife(playerB, 20 - 3); @@ -310,7 +307,6 @@ public class ConditionalManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3); } @@ -331,7 +327,6 @@ public class ConditionalManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); ManaOptions manaOptions = playerA.getAvailableManaTest(currentGame); assertDuplicatedManaOptions(manaOptions); @@ -356,7 +351,6 @@ public class ConditionalManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3); } @@ -380,8 +374,6 @@ public class ConditionalManaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - - assertAllCommandsUsed(); assertPermanentCount(playerA, "Titans' Nest", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/CrypticTrilobiteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/CrypticTrilobiteTest.java index 0cdf671f50..70171e04c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/CrypticTrilobiteTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/CrypticTrilobiteTest.java @@ -7,6 +7,7 @@ import mage.counters.CounterType; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; + import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions; /** @@ -32,8 +33,6 @@ public class CrypticTrilobiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - - assertAllCommandsUsed(); assertPermanentCount(playerA, "Cryptic Trilobite", 1); @@ -65,8 +64,6 @@ public class CrypticTrilobiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - - assertAllCommandsUsed(); assertPermanentCount(playerA, "Cryptic Trilobite", 1); assertCounterCount(playerA, "Cryptic Trilobite", CounterType.P1P1, 3); @@ -101,8 +98,6 @@ public class CrypticTrilobiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - - assertAllCommandsUsed(); assertPermanentCount(playerA, "Cryptic Trilobite", 1); assertCounterCount(playerA, "Cryptic Trilobite", CounterType.P1P1, 5); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/TitansNestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/TitansNestTest.java index a61f627ded..097f22f0e2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/TitansNestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/conditional/TitansNestTest.java @@ -7,6 +7,7 @@ import mage.constants.Zone; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; + import static org.mage.test.utils.ManaOptionsTestUtils.assertManaOptions; /** @@ -32,8 +33,6 @@ public class TitansNestTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - - assertAllCommandsUsed(); assertPermanentCount(playerA, "Titans' Nest", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java index 70ed935c56..610f787a04 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java @@ -53,8 +53,6 @@ public class PhyrexianManaTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - //PlayerA pays life but PlayerB cannot assertLife(playerA, 18); assertLife(playerB, 20); @@ -149,9 +147,7 @@ public class PhyrexianManaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - - //PlayerA pays life + //PlayerA pays life assertLife(playerA, 18); assertLife(playerB, 20); @@ -181,9 +177,7 @@ public class PhyrexianManaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - - assertGraveyardCount(playerB, "Lightning Bolt", 1); + assertGraveyardCount(playerB, "Lightning Bolt", 1); assertGraveyardCount(playerA, "K'rrik, Son of Yawgmoth", 1); assertHandCount(playerA, "Banehound", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/modal/ChooseOneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/modal/ChooseOneTest.java index 9bed3184a4..eae54a3117 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/modal/ChooseOneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/modal/ChooseOneTest.java @@ -49,7 +49,6 @@ public class ChooseOneTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Funeral Charm", 1); assertPowerToughness(playerB, "Silvercoat Lion", 4, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/modal/OneOrMoreTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/modal/OneOrMoreTest.java index e8160237bf..8d65219d62 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/modal/OneOrMoreTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/modal/OneOrMoreTest.java @@ -44,7 +44,6 @@ public class OneOrMoreTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerB, 1); assertHandCount(playerA, "Silvercoat Lion", 1); @@ -82,7 +81,6 @@ public class OneOrMoreTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertHandCount(playerB, 1); assertHandCount(playerA, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planes/UndercityReachesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planes/UndercityReachesTest.java index b6dc83de9f..e07fa7ff76 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planes/UndercityReachesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planes/UndercityReachesTest.java @@ -25,7 +25,6 @@ public class UndercityReachesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 2); assertHandCount(playerA, 1); @@ -45,7 +44,6 @@ public class UndercityReachesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 2); assertHandCount(playerB, 1 + 1); // +1 from turn draw, +1 from trigger diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java index bf4b85a803..dfdbb7bd36 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/GideonTest.java @@ -131,7 +131,6 @@ public class GideonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Silvercoat Lion", 1); assertLife(playerA, 7); @@ -154,7 +153,6 @@ public class GideonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertType("Gideon Jura", CardType.CREATURE, true); assertDamageReceived(playerA, "Gideon Jura", 3); @@ -174,7 +172,6 @@ public class GideonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertType("Gideon Jura", CardType.CREATURE, true); assertDamageReceived(playerA, "Gideon Jura", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java index fd0d71ae31..5a07fbc928 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java @@ -57,7 +57,6 @@ public class LilianaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, bMummy, 1); assertPermanentCount(playerA, liliannaDM, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaStewardOfElementsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaStewardOfElementsTest.java index 478ab343a9..13d07d01df 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaStewardOfElementsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaStewardOfElementsTest.java @@ -23,7 +23,6 @@ public class NissaStewardOfElementsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); if (xValue == 0) { assertGraveyardCount(playerA, nissa, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAllDamageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAllDamageTest.java index c6fe1401b8..43042e701b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAllDamageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAllDamageTest.java @@ -39,8 +39,6 @@ public class PreventAllDamageTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Safe Passage", 1); assertPermanentCount(playerA, "Silvercoat Lion", 1); @@ -78,8 +76,6 @@ public class PreventAllDamageTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Ethereal Haze", 1); assertPermanentCount(playerA, "Silvercoat Lion", 1); @@ -129,8 +125,6 @@ public class PreventAllDamageTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Energy Storm", 1); assertPermanentCount(playerA, "Abbey Griffin", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/AcademyManufactorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/AcademyManufactorTest.java index 585e654799..aeff198035 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/AcademyManufactorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/AcademyManufactorTest.java @@ -18,7 +18,6 @@ public class AcademyManufactorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 1); assertPermanentCount(playerA, "Academy Manufactor", 1); assertPermanentCount(playerA, "Thraben Inspector", 1); @@ -39,7 +38,6 @@ public class AcademyManufactorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 1); assertPermanentCount(playerA, "Academy Manufactor", 2); assertPermanentCount(playerA, "Anointed Procession", 1); @@ -60,7 +58,6 @@ public class AcademyManufactorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 1); assertPermanentCount(playerA, "Academy Manufactor", 6); assertPermanentCount(playerA, "Thraben Inspector", 1); @@ -82,7 +79,6 @@ public class AcademyManufactorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Tundra", 5); assertPermanentCount(playerA, "Academy Manufactor", 2); // Gingerbrute token copy becomes a regular Food diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ChatterfangSquirrelGeneralTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ChatterfangSquirrelGeneralTest.java index 214be36af1..1d7072c3aa 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ChatterfangSquirrelGeneralTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ChatterfangSquirrelGeneralTest.java @@ -20,7 +20,6 @@ public class ChatterfangSquirrelGeneralTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 2); assertPermanentCount(playerA, chatterfang, 1); assertPermanentCount(playerA, "Soldier Token", 2); @@ -38,7 +37,6 @@ public class ChatterfangSquirrelGeneralTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 2); assertPermanentCount(playerB, chatterfang, 1); assertPermanentCount(playerA, "Soldier Token", 2); @@ -62,7 +60,6 @@ public class ChatterfangSquirrelGeneralTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 1); assertPermanentCount(playerA, chatterfang, 1); assertPermanentCount(playerA, "Academy Manufactor", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java index 22972a1db9..427d9ef866 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java @@ -182,7 +182,6 @@ public class DoublingSeasonTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -235,7 +234,6 @@ public class DoublingSeasonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Chandra, Fire Artisan", CounterType.LOYALTY, 4 + 1); } @@ -250,7 +248,6 @@ public class DoublingSeasonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Chandra, Fire Artisan", CounterType.LOYALTY, 4 + (1 + 1) * 2); } @@ -272,8 +269,6 @@ public class DoublingSeasonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Zombie Token", 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/RegenerateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/RegenerateTest.java index fe310095d5..1e18ce7315 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/RegenerateTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/RegenerateTest.java @@ -28,7 +28,6 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -74,7 +73,6 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -109,7 +107,6 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -150,7 +147,6 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -189,7 +185,6 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -234,7 +229,6 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -277,7 +271,6 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -329,7 +322,6 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -365,6 +357,5 @@ public class RegenerateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SanctifierEnVecTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SanctifierEnVecTest.java index 40375e3fa9..62ae3e3c24 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SanctifierEnVecTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SanctifierEnVecTest.java @@ -24,7 +24,6 @@ public class SanctifierEnVecTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, sanctifier, 1); assertGraveyardCount(playerA, "Divination", 1); assertExileCount(playerA, "Lightning Bolt", 1); @@ -53,7 +52,6 @@ public class SanctifierEnVecTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Test that Midnight Reaper did not trigger assertLife(playerA, 20); assertLife(playerB, 20); @@ -85,7 +83,6 @@ public class SanctifierEnVecTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, painter, 1); assertPermanentCount(playerA, sanctifier, 1); assertExileCount(playerA, "Divination", 1); @@ -122,7 +119,6 @@ public class SanctifierEnVecTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Test that Midnight Reaper did not trigger assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ShieldCounterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ShieldCounterTest.java index 3353ec7c9a..a263f6cb62 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ShieldCounterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ShieldCounterTest.java @@ -25,7 +25,6 @@ public class ShieldCounterTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Disciplined Duelist", 1); assertCounterCount("Disciplined Duelist", CounterType.SHIELD, 0); } @@ -42,7 +41,6 @@ public class ShieldCounterTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Disciplined Duelist", 1); assertCounterCount("Disciplined Duelist", CounterType.SHIELD, 0); assertGraveyardCount(playerB, "Hill Giant", 1); @@ -61,7 +59,6 @@ public class ShieldCounterTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Disciplined Duelist", 1); assertCounterCount("Disciplined Duelist", CounterType.SHIELD, 0); } @@ -81,7 +78,6 @@ public class ShieldCounterTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Disciplined Duelist", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DeflectingPalmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DeflectingPalmTest.java index 5fee1f97a0..4ac6ef19fc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DeflectingPalmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DeflectingPalmTest.java @@ -80,8 +80,6 @@ public class DeflectingPalmTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerB, "Deflecting Palm", 1); assertGraveyardCount(playerA, "Dromoka's Command", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/ForcefieldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/ForcefieldTest.java index 2839c48d49..74ae15fec3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/ForcefieldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/ForcefieldTest.java @@ -31,7 +31,6 @@ public class ForcefieldTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 1 - 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/redirect/PalisadeGiantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/redirect/PalisadeGiantTest.java index 3a0ed57363..d282332891 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/redirect/PalisadeGiantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/redirect/PalisadeGiantTest.java @@ -35,7 +35,6 @@ public class PalisadeGiantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Lightning Bolt", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/requirement/BecomeBlockTriggersAITest.java b/Mage.Tests/src/test/java/org/mage/test/cards/requirement/BecomeBlockTriggersAITest.java index 4cfb8e9eaa..51e64c69ce 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/requirement/BecomeBlockTriggersAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/requirement/BecomeBlockTriggersAITest.java @@ -29,7 +29,6 @@ public class BecomeBlockTriggersAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, 0); assertGraveyardCount(playerB, 1); @@ -82,7 +81,6 @@ public class BecomeBlockTriggersAITest extends CardTestPlayerBaseWithAIHelps { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, 0); assertGraveyardCount(playerB, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/requirement/BecomeBlockTriggersMonteCarloAITest.java b/Mage.Tests/src/test/java/org/mage/test/cards/requirement/BecomeBlockTriggersMonteCarloAITest.java index f84378c9f4..f060372581 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/requirement/BecomeBlockTriggersMonteCarloAITest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/requirement/BecomeBlockTriggersMonteCarloAITest.java @@ -32,7 +32,6 @@ public class BecomeBlockTriggersMonteCarloAITest extends CardTestPlayerBaseWithM setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, 0); assertGraveyardCount(playerB, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java index 30b3970267..15b6c923d8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java @@ -30,7 +30,6 @@ public class ArrestTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantAttackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantAttackTest.java index 412aacaa70..2aa28a3e62 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantAttackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantAttackTest.java @@ -38,7 +38,6 @@ public class CantAttackTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -75,7 +74,6 @@ public class CantAttackTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -106,7 +104,6 @@ public class CantAttackTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -167,7 +164,6 @@ public class CantAttackTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -231,7 +227,6 @@ public class CantAttackTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -278,7 +273,6 @@ public class CantAttackTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -465,7 +459,6 @@ public class CantAttackTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -511,7 +504,6 @@ public class CantAttackTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantUseActivatedAbilitiesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantUseActivatedAbilitiesTest.java index e6a6441d2e..ae92f3f43d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantUseActivatedAbilitiesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/CantUseActivatedAbilitiesTest.java @@ -29,9 +29,8 @@ public class CantUseActivatedAbilitiesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_COMBAT); setStrictChooseMode(true); - execute(); - assertAllCommandsUsed(); - + execute(); + // Sol Ring can't produce mana Assert.assertTrue("PlayerB may not be able to produce any mana but he he can produce " + playerB.getManaAvailable(currentGame).toString(), playerB.getManaAvailable(currentGame).toString().equals("[]")); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/MeddlingMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/MeddlingMageTest.java index b9b523b714..b0e8f70c73 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/MeddlingMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/MeddlingMageTest.java @@ -28,7 +28,6 @@ public class MeddlingMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Meddling Mage", 1); assertPermanentCount(playerA, "Savannah Lions", 0); @@ -47,7 +46,7 @@ public class MeddlingMageTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Meddling Mage"); setChoice(playerA, "Lightning Bolt"); // name a spell that can't be cast - + waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Isochron Scepter"); setChoice(playerA, true); // use imprint setChoice(playerA, "Lightning Bolt"); // target for imprint @@ -61,7 +60,6 @@ public class MeddlingMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Meddling Mage", 1); assertPermanentCount(playerA, "Isochron Scepter", 1); @@ -82,13 +80,13 @@ public class MeddlingMageTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Meddling Mage"); setChoice(playerA, "Ainok Tracker"); // name a spell that can't be cast + waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ainok Tracker"); setChoice(playerA, true); // cast it face down as 2/2 creature setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Meddling Mage", 1); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1); @@ -119,7 +117,6 @@ public class MeddlingMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Meddling Mage", 1); @@ -153,7 +150,6 @@ public class MeddlingMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Meddling Mage", 1); assertHandCount(playerA, "Meddling Mage", 0); @@ -184,7 +180,6 @@ public class MeddlingMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Meddling Mage", 1); assertHandCount(playerA, "Meddling Mage", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rolldice/RollDiceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rolldice/RollDiceTest.java index 07f5621495..8bd7cff8cd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rolldice/RollDiceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rolldice/RollDiceTest.java @@ -30,7 +30,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } private void runGoblinTest(int roll, int goblinCount) { @@ -43,7 +42,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, goblins, 1); assertPermanentCount(playerA, "Goblin Token", goblinCount); @@ -87,7 +85,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, goblins, 1); assertPermanentCount(playerA, guide, 1); @@ -109,7 +106,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, goblins, 1); assertPermanentCount(playerA, guide, 2); @@ -136,7 +132,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, goblins, 1); assertPermanentCount(playerA, gallery, 1); @@ -195,7 +190,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, goblins, 1); assertPermanentCount(playerA, "Goblin Token", goblinCount); @@ -230,7 +224,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 2); assertTappedCount("Mountain", true, 1); // cost for second planar die @@ -257,7 +250,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 1); } @@ -287,7 +279,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 1); } @@ -321,7 +312,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 0); } @@ -347,7 +337,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -383,7 +372,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -406,7 +394,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -425,7 +412,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 1); } @@ -448,7 +434,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 1); } @@ -487,7 +472,6 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 1); } @@ -514,6 +498,5 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java index 534c13f463..c3bc06a725 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java @@ -35,7 +35,6 @@ public class CantCastTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Jayemdae Tome", 1); assertPermanentCount(playerA, "Jayemdae Tome", 0); @@ -71,7 +70,6 @@ public class CantCastTest extends CardTestPlayerBase { // longer shown as castable. try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -240,7 +238,6 @@ public class CantCastTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java index a35ce44e53..7b47563ea4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/MeliraSylvokOutcastTest.java @@ -38,7 +38,6 @@ public class MeliraSylvokOutcastTest extends CardTestPlayerBase { // TODO: Needed since Melira's ability isn't been caught by the is playable check try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { if (!e.getMessage().contains("Player PlayerA must have 0 actions but found 1")) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/WorldEnchantmentsRuleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/WorldEnchantmentsRuleTest.java index 69ac7de10b..abf37d9efb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/WorldEnchantmentsRuleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/WorldEnchantmentsRuleTest.java @@ -35,7 +35,6 @@ public class WorldEnchantmentsRuleTest extends CardTestMultiPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Nether Void", 0); assertPermanentCount(playerD, "Nether Void", 1); @@ -58,7 +57,6 @@ public class WorldEnchantmentsRuleTest extends CardTestMultiPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Nether Void", 1); assertPermanentCount(playerC, "Nether Void", 1); @@ -98,7 +96,6 @@ public class WorldEnchantmentsRuleTest extends CardTestMultiPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerD, "Concordant Crossroads", 0); assertPermanentCount(playerA, "Concordant Crossroads", 1); @@ -133,7 +130,6 @@ public class WorldEnchantmentsRuleTest extends CardTestMultiPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Charmed Griffin", 1); assertPermanentCount(playerD, "Concordant Crossroads", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/BeltOfGiantStrengthTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/BeltOfGiantStrengthTest.java index 4fd9ab347b..166afca876 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/BeltOfGiantStrengthTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/BeltOfGiantStrengthTest.java @@ -5,7 +5,6 @@ import mage.constants.SubType; 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; @@ -28,7 +27,6 @@ public class BeltOfGiantStrengthTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertIsAttachedTo(playerA, belt, gigantosauras); Assert.assertTrue( @@ -52,7 +50,6 @@ public class BeltOfGiantStrengthTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertIsAttachedTo(playerA, belt, gigantosauras); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/ShareTheSpoilsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/ShareTheSpoilsTest.java index 6e64a266b8..8c6ab79424 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/ShareTheSpoilsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/ShareTheSpoilsTest.java @@ -26,7 +26,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, 1); assertExileCount(playerB, 1); assertExileCount(playerC, 1); @@ -49,7 +48,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, 1); assertExileCount(playerB, 1); assertExileCount(playerC, 1); @@ -69,7 +67,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, 1); assertExileCount(playerB, 1); assertExileCount(playerC, 1); @@ -94,7 +91,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, 0); assertExileCount(playerB, 1); assertExileCount(playerC, 1); @@ -121,7 +117,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, 0); assertExileCount(playerB, 1); assertExileCount(playerC, 1); @@ -155,8 +150,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Tana, the Bloodsower", 1); assertExileCount(playerA, "Tana, the Bloodsower", 0); @@ -195,8 +188,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Exotic Orchard", 1); assertExileCount(playerA, "Exotic Orchard", 0); @@ -236,8 +227,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertExileCount(playerA, "Lightning Bolt", 1); assertExileCount(playerA, "Reliquary Tower", 0); @@ -279,8 +268,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertExileCount(playerA, "Exotic Orchard", 0); assertExileCount(playerA, "Lightning Bolt", 1); @@ -336,8 +323,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - // 1 exiled with Share the Spoils // 1 exiled Prosper (he only exiles one since we stop before the end step of playerA's second turn) // 1 for the foretold Augury Raven @@ -398,8 +383,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Ardenvale Tactician", 1); assertExileCount(playerA, "Lovestruck Beast", 1); @@ -456,8 +439,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertExileCount(playerA, "Aether Helix", 0); assertExileCount(playerA, "Exotic Orchard", 1); @@ -511,8 +492,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertExileCount(playerA, "Aether Helix", 0); assertExileCount(playerA, "Exotic Orchard", 1); @@ -555,8 +534,6 @@ public class ShareTheSpoilsTest extends CardTestCommander4Players { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerD, "Exotic Orchard",1); assertExileCount(playerA, 0); // playerA's Exotic Orchard was played by playerD diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/BruenorBattlehammerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/BruenorBattlehammerTest.java index 36b4b0c3c3..363bceda0e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/BruenorBattlehammerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/BruenorBattlehammerTest.java @@ -33,7 +33,6 @@ public class BruenorBattlehammerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Plains", true); assertPermanentCount(playerA, bruenor, 1); @@ -55,7 +54,6 @@ public class BruenorBattlehammerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); setStopAt(1, PhaseStep.END_TURN); assertPermanentCount(playerA, bruenor, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/PortableHoleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/PortableHoleTest.java index 6554b239b3..8b891e81c0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/PortableHoleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/PortableHoleTest.java @@ -22,7 +22,6 @@ public class PortableHoleTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, "Grizzly Bears", 1); } @@ -40,7 +39,6 @@ public class PortableHoleTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Grizzly Bears", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/PowerWordKillTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/PowerWordKillTest.java index f950f5c014..03612e9a0f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/PowerWordKillTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/PowerWordKillTest.java @@ -27,7 +27,6 @@ public class PowerWordKillTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Grizzly Bears", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java index 7e974a494d..710a5e2c1c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java @@ -18,7 +18,6 @@ public class ProsperousInnkeeperTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, innkeeper); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Treasure Token", 1); } @@ -30,7 +29,6 @@ public class ProsperousInnkeeperTest extends CardTestPlayerBase { castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, innkeeper); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 21); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/TheTarrasqueTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/TheTarrasqueTest.java index 7f158e6ac3..16acbdcfb3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/TheTarrasqueTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/TheTarrasqueTest.java @@ -38,7 +38,6 @@ public class TheTarrasqueTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, tarrasque, HasteAbility.getInstance(), true); } @@ -69,7 +68,6 @@ public class TheTarrasqueTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, tarrasque, HasteAbility.getInstance(), false); } @@ -110,7 +108,6 @@ public class TheTarrasqueTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, tarrasque, HasteAbility.getInstance(), false); assertAbility(playerA, sakashima, HasteAbility.getInstance(), true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/VorpalSwordTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/VorpalSwordTest.java index 90b197368e..25b028574f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/VorpalSwordTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/VorpalSwordTest.java @@ -2,7 +2,6 @@ package org.mage.test.cards.single.afr; import mage.constants.PhaseStep; import mage.constants.Zone; -import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -22,7 +21,6 @@ public class VorpalSwordTest extends CardTestPlayerBase { attack(3, playerA,"Grizzly Bears", playerB); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertWonTheGame(playerA); assertLostTheGame(playerB); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/VrondissRageOfAncientsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/VrondissRageOfAncientsTest.java index 482e8d1fa9..1d0f677f48 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/VrondissRageOfAncientsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/VrondissRageOfAncientsTest.java @@ -41,6 +41,5 @@ public class VrondissRageOfAncientsTest extends CardTestMultiPlayerBase { // Should only be one trigger since it should only trigger off of playerA's roll execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/XanatharGuildKingpinTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/XanatharGuildKingpinTest.java index 09701105b4..bd66e904a8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/XanatharGuildKingpinTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/XanatharGuildKingpinTest.java @@ -56,6 +56,5 @@ public class XanatharGuildKingpinTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/ApproachOfTheSecondSunTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/ApproachOfTheSecondSunTest.java index 118a19df3e..7e06886f60 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/ApproachOfTheSecondSunTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/ApproachOfTheSecondSunTest.java @@ -32,7 +32,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 27); assertLibraryCount(playerA, 1); // 1 approach put back into library @@ -57,7 +56,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertResult(playerA, GameResult.DRAW); assertLife(playerA, 27); @@ -91,7 +89,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 27); assertLibraryCount(playerA, 9); @@ -125,7 +122,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 27); assertLibraryCount(playerA, 0); @@ -161,7 +157,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 27); assertLibraryCount(playerA, 0); @@ -208,7 +203,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertResult(playerA, GameResult.WON); assertLife(playerA, 34); @@ -249,7 +243,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertResult(playerA, GameResult.WON); assertLife(playerA, 34); @@ -291,7 +284,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertResult(playerA, GameResult.WON); assertLife(playerA, 41); @@ -318,7 +310,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); // Countered, no lifegain assertLibraryCount(playerA, "Approach of the Second Sun", 0); // 0 approach put back into library @@ -345,7 +336,6 @@ public class ApproachOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 27); // lifegain from first spell assertLibraryCount(playerA, "Approach of the Second Sun", 1); // 1 approach put back into library diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/BontuTheGlorifiedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/BontuTheGlorifiedTest.java index a312f75155..1396e7ffe2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/BontuTheGlorifiedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/BontuTheGlorifiedTest.java @@ -29,7 +29,6 @@ public class BontuTheGlorifiedTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/DecimatorBeetleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/DecimatorBeetleTest.java index 8519ec3eca..e31b5af620 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/DecimatorBeetleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/DecimatorBeetleTest.java @@ -43,7 +43,6 @@ Whenever Decimator Beetle attacks, remove a -1/-1 counter from target creature y setStrictChooseMode(true); setStopAt(3, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, grizzly, 2, 2); // had -1/-1 counter, but removed on attack assertPowerToughness(playerB, hillGiant, 2, 2); // gets -1/-1 counter from decimator attack ability diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java index 8d095c31bf..1e2082292e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java @@ -131,6 +131,5 @@ public class HapatraVizierOfPoisonsTest extends CardTestPlayerBase { assertPowerToughness(playerB, krakenHatchling, -2, 2); assertCounterCount(playerB, krakenHatchling, CounterType.M1M1, 2); assertPermanentCount(playerA, "Snake Token", 1); //Should have triggered when Saproling added -1/-1 counter - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/arb/SenTripletsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/arb/SenTripletsTest.java index 2888863974..3f14a40382 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/arb/SenTripletsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/arb/SenTripletsTest.java @@ -32,7 +32,6 @@ public class SenTripletsTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, relic); addCard(Zone.HAND, playerB, "Island"); - assertAllCommandsUsed(); } /** @@ -48,7 +47,6 @@ public class SenTripletsTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, triplets, 1); assertPermanentCount(playerA, relic, 1); assertPermanentCount(playerA, "Island", 1); @@ -71,7 +69,6 @@ public class SenTripletsTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { @@ -96,7 +93,6 @@ public class SenTripletsTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java index 4006a6460f..92f9729abe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java @@ -286,7 +286,6 @@ public class CavernOfSoulsTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Cavern of Souls", 1); assertGraveyardCount(playerA, "Runeclaw Bear", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/ExquisiteBloodTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/ExquisiteBloodTest.java index 03c762d5ee..9d4d42c52b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/ExquisiteBloodTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/ExquisiteBloodTest.java @@ -75,8 +75,6 @@ public class ExquisiteBloodTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - - assertAllCommandsUsed(); assertPowerToughness(playerA, "Defiant Bloodlord", 6, 7); assertCounterCount("Ajani, Inspiring Leader", CounterType.LOYALTY, 7); @@ -120,8 +118,6 @@ public class ExquisiteBloodTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - - assertAllCommandsUsed(); assertExileCount(playerA, "Silvercoat Lion", 1); assertPowerToughness(playerA, "Defiant Bloodlord", 4, 5); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/GiselaBladeOfGoldnightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/GiselaBladeOfGoldnightTest.java index 9689a35cf9..e75783eb4c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/GiselaBladeOfGoldnightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/avr/GiselaBladeOfGoldnightTest.java @@ -68,7 +68,6 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Player A should take double damage assertLife(playerA, 20 - 10); @@ -86,7 +85,6 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // creature takes 2 damage and dies assertPermanentCount(playerA, "Grizzly Bears", 0); @@ -103,7 +101,6 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Player A should take the full 4 damage assertLife(playerA, 20 - 4); @@ -119,7 +116,6 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Player A should take the full 5 damage assertLife(playerA, 15); @@ -136,7 +132,6 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Player A should take half damage 2 (prevent 4/2 round up = 2 damage) assertLife(playerA, 20 - 2); @@ -153,7 +148,6 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Player A should take full damage 5 (wrong result: 2 damage) assertLife(playerA, 20 - 5); @@ -171,7 +165,6 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // creature must be alife, half damage done assertPermanentCount(playerA, "Grizzly Bears", 1); @@ -190,7 +183,6 @@ public class GiselaBladeOfGoldnightTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // creature must die, full damage assertPermanentCount(playerA, "Colossal Dreadmaw", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/ConduitOfRuinTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/ConduitOfRuinTest.java index 83eaf3783d..2d1c01cd0c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/ConduitOfRuinTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/ConduitOfRuinTest.java @@ -43,8 +43,6 @@ public class ConduitOfRuinTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Conduit of Ruin", 1); assertPermanentCount(playerA, "Emrakul, the Aeons Torn", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/bok/ShireiShizosCaretakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/bok/ShireiShizosCaretakerTest.java index 294fe1f614..2c6873a099 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/bok/ShireiShizosCaretakerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/bok/ShireiShizosCaretakerTest.java @@ -27,7 +27,6 @@ public class ShireiShizosCaretakerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, shirei, 1); assertPermanentCount(playerA, rats, 1); } @@ -46,7 +45,6 @@ public class ShireiShizosCaretakerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, shirei, 0); assertPermanentCount(playerA, rats, 0); } @@ -66,7 +64,6 @@ public class ShireiShizosCaretakerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, shirei, 1); assertPermanentCount(playerA, rats, 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java index b04a3ffb38..111cc78e3e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c13/MarathWillOfTheWildTest.java @@ -73,6 +73,5 @@ public class MarathWillOfTheWildTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/KessDissidentMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/KessDissidentMageTest.java index ed32251741..bbd572d20f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/KessDissidentMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/KessDissidentMageTest.java @@ -28,7 +28,6 @@ public class KessDissidentMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Lightning Bolt", 1); assertLife(playerB, 20 - 3); @@ -49,7 +48,6 @@ public class KessDissidentMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Centaur Token", 1); assertLife(playerA, 20); @@ -74,7 +72,6 @@ public class KessDissidentMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Centaur Token", 1); assertLife(playerA, 20 + 2); @@ -99,6 +96,5 @@ public class KessDissidentMageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/TheUrDragonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/TheUrDragonTest.java index 8d6b756001..bbc4a0b6a3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/TheUrDragonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/TheUrDragonTest.java @@ -39,8 +39,7 @@ public class TheUrDragonTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); - + assertPermanentCount(playerA, "Dragon Hatchling", 2); assertPermanentCount(playerA, "Silvercoat Lion", 1 ); assertHandCount(playerA, 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/AminatousAuguryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/AminatousAuguryTest.java index 167c09d5ad..3b1c700951 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/AminatousAuguryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/AminatousAuguryTest.java @@ -54,8 +54,6 @@ public class AminatousAuguryTest extends CardTestPlayerBase { checkPlayableAbility("Cannot cast second creature from exile", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Pillarfield Ox", Boolean.FALSE); // Type Creature type is already consumed execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Aminatou's Augury", 1); assertPermanentCount(playerA, "Mountain", 1); assertPermanentCount(playerA, "Badlands", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/GeodeGolemTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/GeodeGolemTest.java index 3306cb0acf..555d9793b0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/GeodeGolemTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/GeodeGolemTest.java @@ -62,7 +62,6 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 1); } @@ -121,7 +120,6 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Akoum Warrior", 1); } @@ -198,7 +196,6 @@ public class GeodeGolemTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(7, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Harnfel, Horn of Bounty", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/AeonEngineTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/AeonEngineTest.java index 4d83146bf1..c916f018fe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/AeonEngineTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/AeonEngineTest.java @@ -44,8 +44,7 @@ public class AeonEngineTest extends CardTestMultiPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + //check if aeon engine is tapped assertTapped("Aeon Engine", true); @@ -80,8 +79,7 @@ public class AeonEngineTest extends CardTestMultiPlayerBase { setStrictChooseMode(true); setStopAt(6, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + //check if aeon engine has been exiled assertExileCount(playerA, "Aeon Engine", 1); @@ -125,8 +123,7 @@ public class AeonEngineTest extends CardTestMultiPlayerBase { setStrictChooseMode(true); setStopAt(9, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + //check if aeon engine's have been exiled assertExileCount(playerA, "Aeon Engine", 1); assertExileCount(playerD, "Aeon Engine", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ElshaOfTheInfiniteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ElshaOfTheInfiniteTest.java index 1703df289f..ca1a9374dc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ElshaOfTheInfiniteTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ElshaOfTheInfiniteTest.java @@ -48,7 +48,6 @@ public class ElshaOfTheInfiniteTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Harnfel, Horn of Bounty", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/EonFrolickerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/EonFrolickerTest.java index 163aa0b183..602c27771b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/EonFrolickerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/EonFrolickerTest.java @@ -37,7 +37,6 @@ public class EonFrolickerTest extends CardTestPlayerBase { //setStrictChooseMode(true); // AI must choose target for fury (itself) setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Chandra's Fury", 1); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/PakoArcaneRetrieverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/PakoArcaneRetrieverTest.java index 849e3ede9b..d2f8de5c85 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/PakoArcaneRetrieverTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/PakoArcaneRetrieverTest.java @@ -39,9 +39,7 @@ public class PakoArcaneRetrieverTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - - assertAllCommandsUsed(); - + assertLife(playerA, 20); assertLife(playerB, 17); @@ -82,9 +80,7 @@ public class PakoArcaneRetrieverTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - - assertAllCommandsUsed(); - + assertLife(playerA, 20); assertLife(playerB, 12); // 3+2 (attack) + 3 Lighning Bolt diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/TwinningStaffTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/TwinningStaffTest.java index ddc236ddee..7d4b1a1d06 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/TwinningStaffTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c20/TwinningStaffTest.java @@ -36,7 +36,6 @@ public class TwinningStaffTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, zada, 3 + 3, 3 + 3); assertPowerToughness(playerA, bear, 2 + 3 + 3, 2 + 3 + 3); @@ -57,7 +56,6 @@ public class TwinningStaffTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, zada, 3 + 3, 3 + 3); assertPowerToughness(playerA, bear, 2 + 3 + 3 + 3, 2 + 3 + 3 + 3); @@ -81,7 +79,6 @@ public class TwinningStaffTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, disfigure, 1); assertGraveyardCount(playerA, fork, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/HorobiDeathsWailTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/HorobiDeathsWailTest.java index 9b8f2ac984..d85f937380 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/HorobiDeathsWailTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/HorobiDeathsWailTest.java @@ -21,7 +21,6 @@ public class HorobiDeathsWailTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Animate Dead", "Horobi, Death's Wail"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Horobi, Death's Wail", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/TatsumasaTheDragonsFangTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/TatsumasaTheDragonsFangTest.java index 1afb305ae3..33adec7e05 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/TatsumasaTheDragonsFangTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/TatsumasaTheDragonsFangTest.java @@ -26,7 +26,6 @@ public class TatsumasaTheDragonsFangTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, tatsumasa, 1); assertGraveyardCount(playerA, murder, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/UbaMaskTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/UbaMaskTest.java index 8973bebdab..7238a81039 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/UbaMaskTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/UbaMaskTest.java @@ -52,7 +52,6 @@ public class UbaMaskTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 1); } @@ -81,7 +80,6 @@ public class UbaMaskTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Valki, God of Lies", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/AcornCatapultTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/AcornCatapultTest.java index 4775c5e332..9b0cdc02de 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/AcornCatapultTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/AcornCatapultTest.java @@ -30,8 +30,6 @@ public class AcornCatapultTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Acorn Catapult", 1); assertGraveyardCount(playerB, "Acolyte of Xathrid", 1); @@ -55,8 +53,6 @@ public class AcornCatapultTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Acorn Catapult", 1); assertLife(playerB, 19); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/AkromaVisionOfIxidorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/AkromaVisionOfIxidorTest.java index ee85a86d8e..477cc471f9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/AkromaVisionOfIxidorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/AkromaVisionOfIxidorTest.java @@ -38,6 +38,5 @@ public class AkromaVisionOfIxidorTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/AkromasWillTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/AkromasWillTest.java index 82d5c18602..f66dad9444 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/AkromasWillTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/AkromasWillTest.java @@ -38,7 +38,6 @@ public class AkromasWillTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -76,6 +75,5 @@ public class AkromasWillTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArchelosLagoonMysticTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArchelosLagoonMysticTest.java index b637b9e747..924d682d98 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArchelosLagoonMysticTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArchelosLagoonMysticTest.java @@ -41,6 +41,5 @@ public class ArchelosLagoonMysticTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArmixFiligreeThrasherTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArmixFiligreeThrasherTest.java index e3c05947a4..ae8cecdc4e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArmixFiligreeThrasherTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ArmixFiligreeThrasherTest.java @@ -32,7 +32,6 @@ public class ArmixFiligreeThrasherTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Grizzly Bears", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/EligethCrossroadsAugurTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/EligethCrossroadsAugurTest.java index 32186e6a77..f0060b7f56 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/EligethCrossroadsAugurTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/EligethCrossroadsAugurTest.java @@ -29,7 +29,6 @@ public class EligethCrossroadsAugurTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Faerie Seer", 1); assertHandCount(playerA, "Balduvian Bears", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/GilanraCallerOfWirewoodTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/GilanraCallerOfWirewoodTest.java index 95c508dd6f..3a219f0bab 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/GilanraCallerOfWirewoodTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/GilanraCallerOfWirewoodTest.java @@ -31,7 +31,6 @@ public class GilanraCallerOfWirewoodTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Angel of Deliverance", 1); assertHandCount(playerA, 1); // draw from trigger @@ -57,7 +56,6 @@ public class GilanraCallerOfWirewoodTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Angel of Deliverance", 1); assertHandCount(playerA, 1); // draw from trigger @@ -87,7 +85,6 @@ public class GilanraCallerOfWirewoodTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Angel of Deliverance", 1); assertHandCount(playerA, 1 + 1); // draw from turn 3 and draw from trigger @@ -124,7 +121,6 @@ public class GilanraCallerOfWirewoodTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Angel of Deliverance", 1); assertHandCount(playerA, 2); // 2 draws from 2 triggers diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HansErikssonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HansErikssonTest.java index 1f113dc213..e1872d4b36 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HansErikssonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HansErikssonTest.java @@ -30,7 +30,6 @@ public class HansErikssonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 1); assertHandCount(playerA, "Swamp", 1); @@ -55,7 +54,6 @@ public class HansErikssonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 1 - 2); // damage from hans and bears } @@ -80,7 +78,6 @@ public class HansErikssonTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 1); // damage from hans assertCounterCount(playerB, "Chandra, Flame's Fury", CounterType.LOYALTY, 4 - 2); // damage from bears diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HellkiteCourserTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HellkiteCourserTest.java index 0b3d61a1b1..986babaf82 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HellkiteCourserTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/HellkiteCourserTest.java @@ -45,6 +45,5 @@ public class HellkiteCourserTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/JeweledLotusTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/JeweledLotusTest.java index 69cd8fe864..2cdf61c1fd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/JeweledLotusTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/JeweledLotusTest.java @@ -29,7 +29,6 @@ public class JeweledLotusTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -54,7 +53,6 @@ public class JeweledLotusTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/KrarkTheThumblessTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/KrarkTheThumblessTest.java index da785a8b2f..e84f04cbb9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/KrarkTheThumblessTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/KrarkTheThumblessTest.java @@ -79,7 +79,6 @@ public class KrarkTheThumblessTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 4 * 3); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ProfaneTransfusionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ProfaneTransfusionTest.java index 51218bf8e4..ccfdc6ba48 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ProfaneTransfusionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ProfaneTransfusionTest.java @@ -30,7 +30,6 @@ public class ProfaneTransfusionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 16); assertLife(playerB, 24); @@ -56,7 +55,6 @@ public class ProfaneTransfusionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 24); assertLife(playerB, 16); @@ -82,7 +80,6 @@ public class ProfaneTransfusionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 16); assertLife(playerB, 32); @@ -106,7 +103,6 @@ public class ProfaneTransfusionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 17); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/PromiseOfTomorrowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/PromiseOfTomorrowTest.java index 863eef7532..dfdd36b840 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/PromiseOfTomorrowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/PromiseOfTomorrowTest.java @@ -37,7 +37,6 @@ public class PromiseOfTomorrowTest extends CardTestCommander4Players { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -76,7 +75,6 @@ public class PromiseOfTomorrowTest extends CardTestCommander4Players { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -116,6 +114,5 @@ public class PromiseOfTomorrowTest extends CardTestCommander4Players { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/RakshasaDebaserTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/RakshasaDebaserTest.java index 341a960099..8cf9337e90 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/RakshasaDebaserTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/RakshasaDebaserTest.java @@ -24,7 +24,6 @@ public class RakshasaDebaserTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); // from trigger } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/SphinxOfTheSecondSunTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/SphinxOfTheSecondSunTest.java index 6e8e4f71a0..e1c8806b12 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/SphinxOfTheSecondSunTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/SphinxOfTheSecondSunTest.java @@ -25,7 +25,6 @@ public class SphinxOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // 2x upkeep phases (1x normal + 1x from sphinx) assertLife(playerA, 20 + 2); @@ -48,7 +47,6 @@ public class SphinxOfTheSecondSunTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // 3x upkeep phases (1x normal + 2x from sphinx) assertLife(playerA, 20 + 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cns/PalaceJailerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cns/PalaceJailerTest.java index 090f4d9fc4..3bfbca6313 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cns/PalaceJailerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cns/PalaceJailerTest.java @@ -31,8 +31,6 @@ public class PalaceJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Palace Jailer", 1); assertExileCount(playerB, "Silvercoat Lion", 1); @@ -81,8 +79,6 @@ public class PalaceJailerTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Palace Jailer", 1); assertPermanentCount(playerB, "Palace Jailer", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/FiendOfTheShadowsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/FiendOfTheShadowsTest.java index 1cc5e6de1a..a089e64dbc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/FiendOfTheShadowsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/FiendOfTheShadowsTest.java @@ -57,7 +57,6 @@ public class FiendOfTheShadowsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 17); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dom/SimpleDominariaCards.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dom/SimpleDominariaCards.java index 06a61eea53..e3ac6a8c3a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dom/SimpleDominariaCards.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dom/SimpleDominariaCards.java @@ -2,7 +2,6 @@ package org.mage.test.cards.single.dom; import mage.constants.PhaseStep; import mage.constants.Zone; -import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -74,7 +73,6 @@ public class SimpleDominariaCards extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Knight of Grace", 0); assertGraveyardCount(playerB, "Avatar of Woe", 1); // Autokills itself since its only valid target diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/DemonsHornTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/DemonsHornTest.java index c8c47a1bee..83ca49d88e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/DemonsHornTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/DemonsHornTest.java @@ -29,8 +29,6 @@ public class DemonsHornTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Abyssal Gatekeeper", 1); assertLife(playerA, 20); @@ -61,8 +59,6 @@ public class DemonsHornTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Alesha, Who Smiles at Death", 1); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dtk/LivingLoreTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dtk/LivingLoreTest.java index 70358ce060..673328eac0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dtk/LivingLoreTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dtk/LivingLoreTest.java @@ -45,7 +45,6 @@ public class LivingLoreTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Living Lore", 0); assertGraveyardCount(playerA, "Lightning Bolt", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/BarteredCowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/BarteredCowTest.java index 672e3c3542..2d1ced81f6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/BarteredCowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/BarteredCowTest.java @@ -25,8 +25,6 @@ public class BarteredCowTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerB, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Bartered Cow", 1); assertPermanentCount(playerA, "Food Token", 1); @@ -52,8 +50,6 @@ public class BarteredCowTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerB, "Funeral Charm", 1); assertGraveyardCount(playerA, "Bartered Cow", 1); assertPermanentCount(playerA, "Food Token", 1); @@ -78,8 +74,6 @@ public class BarteredCowTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Bartered Cow", 1); assertHandCount(playerA, "Silvercoat Lion", 1); assertPermanentCount(playerA, "Food Token", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/OnceUponATimeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/OnceUponATimeTest.java index fb702e3d2c..f7ebfae8cf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/OnceUponATimeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/OnceUponATimeTest.java @@ -40,8 +40,6 @@ public class OnceUponATimeTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Once Upon a Time", 1); assertTappedCount("Forest", true, 2); assertHandCount(playerA, "Silvercoat Lion", 1); @@ -78,8 +76,6 @@ public class OnceUponATimeTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Once Upon a Time", 1); assertGraveyardCount(playerB, "Once Upon a Time", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/RobberOfTheRichTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/RobberOfTheRichTest.java index ebb23c2dba..a658ebbe87 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/RobberOfTheRichTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/RobberOfTheRichTest.java @@ -29,7 +29,6 @@ public class RobberOfTheRichTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 + 5); assertGraveyardCount(playerB, passage, 1); @@ -52,7 +51,6 @@ public class RobberOfTheRichTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 + 5); assertGraveyardCount(playerB, passage, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/TorbranThaneOfRedFellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/TorbranThaneOfRedFellTest.java index 1adcc13a0f..5f22772222 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/TorbranThaneOfRedFellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/TorbranThaneOfRedFellTest.java @@ -31,7 +31,6 @@ public class TorbranThaneOfRedFellTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 11); // damage from: attack 2 + 2 Bolt 3 + 2 @@ -64,7 +63,6 @@ public class TorbranThaneOfRedFellTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 15); // Attack from Horde 3+2 assertLife(playerB, 18); // Damage from planeswalker 2 @@ -101,7 +99,6 @@ public class TorbranThaneOfRedFellTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 15); // Attack from Horde 3+2 assertLife(playerB, 18); // Damage from planeswalker 2 diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/EmrakulThePromisedEndTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/EmrakulThePromisedEndTest.java index 0a51f5095d..96269a9c91 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/EmrakulThePromisedEndTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/EmrakulThePromisedEndTest.java @@ -27,7 +27,6 @@ public class EmrakulThePromisedEndTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertActivePlayer(playerB); } @@ -45,7 +44,6 @@ public class EmrakulThePromisedEndTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertActivePlayer(playerA); } @@ -63,7 +61,6 @@ public class EmrakulThePromisedEndTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(4, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertActivePlayer(playerA); } @@ -85,7 +82,6 @@ public class EmrakulThePromisedEndTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Emrakul, the Promised End", 1); } @@ -112,7 +108,6 @@ public class EmrakulThePromisedEndTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Emrakul, the Promised End", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/HotheadedGiantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/HotheadedGiantTest.java index 4e482fd70e..baf88f59cb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/HotheadedGiantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/HotheadedGiantTest.java @@ -25,7 +25,6 @@ public class HotheadedGiantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, giant, CounterType.M1M1, 0); } @@ -40,7 +39,6 @@ public class HotheadedGiantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, giant, CounterType.M1M1, 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/SoulReapTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/SoulReapTest.java index 13013b89dc..a700489e2f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/SoulReapTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/SoulReapTest.java @@ -26,7 +26,6 @@ public class SoulReapTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lion, 0); assertPermanentCount(playerA, rats, 1); @@ -46,7 +45,6 @@ public class SoulReapTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lion, 0); assertGraveyardCount(playerA, lion, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/fdn/RiteOfPassageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/fdn/RiteOfPassageTest.java index b58ab70d2e..2ae8ccec09 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/fdn/RiteOfPassageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/fdn/RiteOfPassageTest.java @@ -22,7 +22,6 @@ public class RiteOfPassageTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA,"Shock","Watchwolf"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount("Watchwolf", CounterType.P1P1, 1); } @@ -43,7 +42,6 @@ public class RiteOfPassageTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA,"Shock","Watchwolf"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount("Watchwolf", CounterType.P1P1, 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java index 5fb8020e10..cb2dce5a39 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java @@ -35,7 +35,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Grizzly Bears", 4, 4, Filter.ComparisonScope.Any); assertPowerToughness(playerB, "Grizzly Bears", 4, 4, Filter.ComparisonScope.Any); @@ -57,7 +56,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1); assertPowerToughness(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 4, 4); @@ -80,7 +78,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 1); //assertPowerToughness(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 2, 2); // no boost (permanent have haste) @@ -99,7 +96,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Soldier Token", 3, 3); } @@ -117,7 +113,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerB, "Goblin Guide", 2, 3); } @@ -130,7 +125,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Hundroog", 4, 7); } @@ -150,7 +144,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Forest", 6, 4); @@ -183,7 +176,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Grizzly Bears", 4, 2); @@ -208,7 +200,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Grizzly Bears", 2, 2); } @@ -229,7 +220,6 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // Graveyard has artifact, enchantment and tribal assertPowerToughness(playerA, "Tarmogoyf", 3, 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/YixlidJailerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/YixlidJailerTest.java index 426ca61013..8a01881dd6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/YixlidJailerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/YixlidJailerTest.java @@ -27,7 +27,6 @@ public class YixlidJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Narcomoeba", 1); assertGraveyardCount(playerA, "Thought Scour", 1); assertGraveyardCount(playerA, "Narcomoeba", 0); @@ -47,7 +46,6 @@ public class YixlidJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, 0); // Emrakul should shuffle graveyard into library } @@ -64,7 +62,6 @@ public class YixlidJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, 0); // Emrakul should shuffle graveyard into library assertPermanentCount(playerA, "Emrakul, the Aeons Torn", 0); } @@ -84,7 +81,6 @@ public class YixlidJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Narcomoeba", 0); assertGraveyardCount(playerA, "Thought Scour", 1); assertGraveyardCount(playerA, "Narcomoeba", 1); @@ -105,7 +101,6 @@ public class YixlidJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Emrakul, the Aeons Torn", 1); } @@ -123,7 +118,6 @@ public class YixlidJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Emrakul, the Aeons Torn", 1); // Emrakul should not trigger even if removed from the battlefield assertPermanentCount(playerA, "Emrakul, the Aeons Torn", 0); } @@ -142,7 +136,6 @@ public class YixlidJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Midnight Reaper", 1); assertPermanentCount(playerB, "Yixlid Jailer", 1); assertLife(playerA, 19); // Midnight Reaper should still trigger @@ -161,7 +154,6 @@ public class YixlidJailerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Midnight Reaper", 1); assertGraveyardCount(playerB, "Yixlid Jailer", 1); assertLife(playerA, 19); // Midnight Reaper should still trigger diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/gnt/MilitantAngelTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/gnt/MilitantAngelTest.java index 0221ab5a93..f686297194 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/gnt/MilitantAngelTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/gnt/MilitantAngelTest.java @@ -56,7 +56,6 @@ public class MilitantAngelTest extends CardTestCommander4Players { setStrictChooseMode(true); setStopAt(6, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } private void mustHaveValue(String needInfo, int turnNum, PhaseStep step, int needValue) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/BeamsplitterMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/BeamsplitterMageTest.java index 2e4c4b68ad..80cfef86fb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/BeamsplitterMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/BeamsplitterMageTest.java @@ -27,7 +27,6 @@ public class BeamsplitterMageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, bsm, 0); assertPermanentCount(playerA, lion, 0); @@ -50,7 +49,6 @@ public class BeamsplitterMageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, bsm, 5, 5); assertPowerToughness(playerA, lion, 5, 5); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/PeltCollectorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/PeltCollectorTest.java index 44722249fd..b25ea871c4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/PeltCollectorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/PeltCollectorTest.java @@ -42,8 +42,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerB, collector, 1, 1); assertPowerToughness(playerA, lion, 2, 2); @@ -84,8 +82,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerB, collector, 1, 1); assertPowerToughness(playerA, "Soldier Token", 2, 2, Filter.ComparisonScope.All); @@ -111,8 +107,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, collector, 2, 2); assertCounterCount(collector, CounterType.P1P1, 1); } @@ -130,8 +124,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, collector, 2, 2); assertCounterCount(collector, CounterType.P1P1, 1); } @@ -151,8 +143,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, collector, 2, 2); assertCounterCount(collector, CounterType.P1P1, 1); } @@ -172,8 +162,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, collector, 3, 3); assertCounterCount(collector, CounterType.P1P1, 2); } @@ -193,8 +181,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, collector, 3, 3); assertCounterCount(collector, CounterType.P1P1, 2); } @@ -215,8 +201,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, collector, 4, 4); assertCounterCount(collector, CounterType.P1P1, 0); } @@ -237,8 +221,6 @@ public class PeltCollectorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, collector, 1, 1); assertCounterCount(collector, CounterType.P1P1, 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/ThousandYearStormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/ThousandYearStormTest.java index 7d85b0303c..025199a960 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/ThousandYearStormTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/ThousandYearStormTest.java @@ -42,7 +42,6 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -70,7 +69,6 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -98,7 +96,6 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -126,7 +123,6 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -154,7 +150,6 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -216,7 +211,6 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -250,7 +244,6 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -270,7 +263,6 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(4, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } /* @@ -322,6 +314,5 @@ public class ThousandYearStormTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(4, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/AbandonedSarcophagusTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/AbandonedSarcophagusTest.java index 78a337ba30..7a4e6c8347 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/AbandonedSarcophagusTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/AbandonedSarcophagusTest.java @@ -25,8 +25,6 @@ public class AbandonedSarcophagusTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Astral Drift", 1); } @@ -46,7 +44,6 @@ public class AbandonedSarcophagusTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } /** @@ -71,8 +68,6 @@ public class AbandonedSarcophagusTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertHandCount(playerA, 2); assertGraveyardCount(playerA, 2); } @@ -101,8 +96,6 @@ public class AbandonedSarcophagusTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertExileCount(playerA, 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/TormentOfHailfireTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/TormentOfHailfireTest.java index a9bccd5b08..9cb197f54f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/TormentOfHailfireTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/hou/TormentOfHailfireTest.java @@ -74,8 +74,6 @@ public class TormentOfHailfireTest extends CardTestMultiPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Torment of Hailfire", 1); assertLife(playerA, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ice/ZursWeirdingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ice/ZursWeirdingTest.java index b5dbbba21a..703af4ba65 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ice/ZursWeirdingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ice/ZursWeirdingTest.java @@ -21,7 +21,6 @@ public class ZursWeirdingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 2); assertGraveyardCount(playerB, 1); @@ -37,7 +36,6 @@ public class ZursWeirdingTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertGraveyardCount(playerB, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/GenesisUltimatumTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/GenesisUltimatumTest.java index d1385bfadb..e5e11e4c30 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/GenesisUltimatumTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/GenesisUltimatumTest.java @@ -35,7 +35,6 @@ public class GenesisUltimatumTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Genesis Ultimatum", 1); assertPermanentCount(playerA, "Grizzly Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/KinnanBonderProdigyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/KinnanBonderProdigyTest.java index 358c13c70c..7ac13deba5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/KinnanBonderProdigyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/KinnanBonderProdigyTest.java @@ -34,7 +34,6 @@ public class KinnanBonderProdigyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, hovermyr, 1); assertPermanentCount(playerA, egg, 0); @@ -63,7 +62,6 @@ public class KinnanBonderProdigyTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, hovermyr, 1); assertPermanentCount(playerA, "Treasure Token", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/OboshThePreypiercerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/OboshThePreypiercerTest.java index 0614756504..acffc4d885 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/OboshThePreypiercerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/OboshThePreypiercerTest.java @@ -27,7 +27,6 @@ public class OboshThePreypiercerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 3); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/SkycatSovereignTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/SkycatSovereignTest.java index 1d6bf85f29..f94f1a38b0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/SkycatSovereignTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/SkycatSovereignTest.java @@ -28,8 +28,7 @@ public class SkycatSovereignTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - - assertAllCommandsUsed(); + assertPowerToughness(playerA, "Skycat Sovereign", 3, 3); } @@ -54,8 +53,7 @@ public class SkycatSovereignTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - - assertAllCommandsUsed(); + assertPowerToughness(playerA, "Skycat Sovereign", 1, 1); } @@ -77,9 +75,7 @@ public class SkycatSovereignTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - - assertAllCommandsUsed(); - + assertPermanentCount(playerA, "Cat Bird Token", 1); assertColor(playerA, "Cat Bird Token", ObjectColor.WHITE, true); assertColor(playerA, "Cat Bird Token", ObjectColor.BLUE, false); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/TheOzolithTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/TheOzolithTest.java index 5619ac083a..bad9536734 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/TheOzolithTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/TheOzolithTest.java @@ -37,7 +37,6 @@ public class TheOzolithTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, FERTILID, 0); assertCounterCount(THE_OZOLITH, CounterType.P1P1, 2); @@ -61,7 +60,6 @@ public class TheOzolithTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, FERTILID, 0); assertCounterCount(WALKING_CORPSE, CounterType.P1P1, 2); @@ -84,7 +82,6 @@ public class TheOzolithTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, FERTILID, 0); assertCounterCount(TATTERKITE, CounterType.P1P1, 0); @@ -109,7 +106,6 @@ public class TheOzolithTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, FERTILID, 0); assertCounterCount(WALKING_CORPSE, CounterType.P1P1, 0); @@ -136,7 +132,6 @@ public class TheOzolithTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, FERTILID, 0); assertCounterCount(WALKING_CORPSE, CounterType.P1P1, 4); @@ -160,7 +155,6 @@ public class TheOzolithTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, FERTILID, 0); // The Ozolith should be a creature which received 4 +1/+1 counters and 3 -1/-1 counters diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/UnpredictableCycloneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/UnpredictableCycloneTest.java index 8392ef4edc..b58d22c2ff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/UnpredictableCycloneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/UnpredictableCycloneTest.java @@ -27,7 +27,6 @@ public class UnpredictableCycloneTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Piker", 1); } @@ -47,7 +46,6 @@ public class UnpredictableCycloneTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Swamp", 1); } @@ -72,7 +70,6 @@ public class UnpredictableCycloneTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Piker", 2); } @@ -100,7 +97,6 @@ public class UnpredictableCycloneTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Piker", 4); } @@ -125,7 +121,6 @@ public class UnpredictableCycloneTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Piker", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZilorthaStrengthIncarnateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZilorthaStrengthIncarnateTest.java index f0fee7cdc8..8613548267 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZilorthaStrengthIncarnateTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZilorthaStrengthIncarnateTest.java @@ -21,7 +21,6 @@ public class ZilorthaStrengthIncarnateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Savai Sabertooth", 1); assertGraveyardCount(playerB, "Drannith Healer", 1); @@ -39,7 +38,6 @@ public class ZilorthaStrengthIncarnateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Savai Sabertooth", 0); assertGraveyardCount(playerB, "Drannith Healer", 1); @@ -61,7 +59,6 @@ public class ZilorthaStrengthIncarnateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Aegis Turtle", 0); assertGraveyardCount(playerB, "Aegis Turtle", 0); @@ -78,7 +75,6 @@ public class ZilorthaStrengthIncarnateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Savai Sabertooth", 1); assertGraveyardCount(playerB, "Flame Spill", 1); @@ -98,7 +94,6 @@ public class ZilorthaStrengthIncarnateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Savai Sabertooth", 1); assertGraveyardCount(playerB, "Flame Spill", 1); @@ -126,7 +121,6 @@ public class ZilorthaStrengthIncarnateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Zilortha, Strength Incarnate", 1); assertGraveyardCount(playerA, "Savai Sabertooth", 1); @@ -147,7 +141,6 @@ public class ZilorthaStrengthIncarnateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Maned Serval", 1); assertGraveyardCount(playerB, "Maned Serval", 1); @@ -170,7 +163,6 @@ public class ZilorthaStrengthIncarnateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Maned Serval", 1); assertGraveyardCount(playerB, "Maned Serval", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZirdaTheDawnwakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZirdaTheDawnwakerTest.java index 200fd7ecd9..40ccc7920b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZirdaTheDawnwakerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/ZirdaTheDawnwakerTest.java @@ -28,7 +28,6 @@ public class ZirdaTheDawnwakerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Swamp", true); assertAbility(playerA, golem, TrampleAbility.getInstance(), true); @@ -45,7 +44,6 @@ public class ZirdaTheDawnwakerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Swamp", true); assertGraveyardCount(playerA, mauler, 1); @@ -65,7 +63,6 @@ public class ZirdaTheDawnwakerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lion, 1); assertTapped(lion, true); @@ -91,7 +88,6 @@ public class ZirdaTheDawnwakerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, zirda, 1); assertPermanentCount(playerA, lion, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java index b54d5d6072..14a36078b8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java @@ -53,6 +53,5 @@ public class SpreadingPlagueTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/TravelersCloakTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/TravelersCloakTest.java index 4e83fda10f..4e5c7168f2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/TravelersCloakTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/TravelersCloakTest.java @@ -49,6 +49,5 @@ public class TravelersCloakTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/jou/DeicideTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/jou/DeicideTest.java index 28fdebe335..dc8f56444f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/jou/DeicideTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/jou/DeicideTest.java @@ -25,7 +25,6 @@ public class DeicideTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExiledCardSubtype("Heliod, Sun-Crowned", SubType.GOD); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/jou/KruphixGodOfHorizonsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/jou/KruphixGodOfHorizonsTest.java index 73359b77e9..f7276889bb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/jou/KruphixGodOfHorizonsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/jou/KruphixGodOfHorizonsTest.java @@ -27,7 +27,6 @@ public class KruphixGodOfHorizonsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertManaPool(playerA, ManaType.COLORLESS, 3); assertManaPool(playerA, ManaType.GREEN, 0); @@ -51,7 +50,6 @@ public class KruphixGodOfHorizonsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertManaPool(playerA, ManaType.COLORLESS, 0); assertManaPool(playerA, ManaType.GREEN, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khc/EtherealValkyrieTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khc/EtherealValkyrieTest.java index b86c6c8243..0101f06591 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khc/EtherealValkyrieTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khc/EtherealValkyrieTest.java @@ -1,7 +1,5 @@ package org.mage.test.cards.single.khc; -import mage.abilities.keyword.ForecastAbility; -import mage.cards.basiclands.Mountain; import mage.constants.PhaseStep; import mage.constants.Zone; import org.junit.Test; @@ -56,13 +54,11 @@ public class EtherealValkyrieTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, alloyMyr, 1); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Foretell"); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, alloyMyr, 0); assertPermanentCount(playerA, alloyMyr, 1); } @@ -85,14 +81,12 @@ public class EtherealValkyrieTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, exoticOrchard, 1); checkPlayableAbility("Can't fortell land", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Foretell", false); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } /** @@ -114,7 +108,6 @@ public class EtherealValkyrieTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, blightclimbPathway, 1); checkPlayableAbility("Can't fortell land", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Foretell", false); } @@ -138,7 +131,6 @@ public class EtherealValkyrieTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, akoumWarrior, 1); // TODO: Add functionality to test for this programmatically by changing assertAbilityCount @@ -147,7 +139,6 @@ public class EtherealValkyrieTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, akoumWarrior, 0); assertPermanentCount(playerA, akoumWarrior, 1); } @@ -176,7 +167,6 @@ public class EtherealValkyrieTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, alrund, 2); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Foretell {1}"); @@ -184,7 +174,6 @@ public class EtherealValkyrieTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, alrund, 0); assertPermanentCount(playerA, alrund, 1); assertPermanentCount(playerA, hakka, 1); @@ -207,13 +196,11 @@ public class EtherealValkyrieTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, ancestralVision, 1); checkPlayableAbility("Can't fortell suspend-only card", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Foretell", false); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/CripplingFearTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/CripplingFearTest.java index 68dc84d849..0bf3fdc266 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/CripplingFearTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/CripplingFearTest.java @@ -26,7 +26,6 @@ public class CripplingFearTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lion, 0); assertPermanentCount(playerA, elf, 1); @@ -47,7 +46,6 @@ public class CripplingFearTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lion, 1); assertPermanentCount(playerA, elf, 0); @@ -68,7 +66,6 @@ public class CripplingFearTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, lion, 0); assertPermanentCount(playerA, elf, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java index 58b7ae9600..5a3fb9d1eb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java @@ -50,7 +50,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, bear, 0); assertPermanentCount(playerA, bear, 1); @@ -71,7 +70,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, bear, 0); assertPermanentCount(playerA, bear, 1); @@ -97,7 +95,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { try { // TODO: The bears are labelled as playable for some reason. Need the try-catch execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { if (!e.getMessage().contains("Player PlayerA must have 0 actions but found 1")) { @@ -125,7 +122,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, pair, 0); assertPermanentCount(playerA, pair, 1); @@ -146,7 +142,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, pair, 1); assertGraveyardCount(playerB, pair, 0); @@ -168,7 +163,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, pair, 0); assertPermanentCount(playerA, pair, 1); @@ -189,7 +183,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, pair, 1); assertGraveyardCount(playerB, pair, 0); @@ -213,7 +206,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, birgi, 1); assertGraveyardCount(playerB, birgi, 0); @@ -237,7 +229,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, harnfel, 1); assertPermanentCount(playerA, birgi, 0); @@ -262,7 +253,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, birgi, 1); assertGraveyardCount(playerB, birgi, 0); @@ -286,7 +276,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, harnfel, 1); assertPermanentCount(playerA, birgi, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DreamDevourerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DreamDevourerTest.java index 36b900e1b0..852c67b26d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DreamDevourerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DreamDevourerTest.java @@ -57,7 +57,6 @@ public class DreamDevourerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 2); } @@ -88,7 +87,6 @@ public class DreamDevourerTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -120,7 +118,6 @@ public class DreamDevourerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Akoum Warrior", 1); } @@ -153,7 +150,6 @@ public class DreamDevourerTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Jorn, God of Winter", 1); assertPermanentCount(playerA, "Kaldring, the Rimestaff", 1); @@ -200,7 +196,6 @@ public class DreamDevourerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Lonesome Unicorn", 2); assertPermanentCount(playerA, "Knight Token", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/FrostpyreArcanistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/FrostpyreArcanistTest.java index 5b1efbec35..fba428db6f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/FrostpyreArcanistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/FrostpyreArcanistTest.java @@ -36,7 +36,6 @@ public class FrostpyreArcanistTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLibraryCount(playerA, bolt, 0); assertHandCount(playerA, bolt, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/KarfellHarbingerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/KarfellHarbingerTest.java index 0b71d15d7a..0d5394b5ee 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/KarfellHarbingerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/KarfellHarbingerTest.java @@ -30,7 +30,6 @@ public class KarfellHarbingerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Augury Raven", 0); } @@ -48,7 +47,6 @@ public class KarfellHarbingerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Obsessive Search", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/MoritteOfTheFrostTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/MoritteOfTheFrostTest.java index 98e5ec0d6e..e0e6a4073d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/MoritteOfTheFrostTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/MoritteOfTheFrostTest.java @@ -35,7 +35,6 @@ public class MoritteOfTheFrostTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Moritte of the Frost", 1); // removed to graveyard due 0/0 } @@ -64,7 +63,6 @@ public class MoritteOfTheFrostTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Moritte of the Frost", 1); // boosted +1/+1 } @@ -99,7 +97,6 @@ public class MoritteOfTheFrostTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/RuneOfFlightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/RuneOfFlightTest.java index 9ca3843412..ba780fb30c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/RuneOfFlightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/RuneOfFlightTest.java @@ -26,7 +26,6 @@ public class RuneOfFlightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Grizzly Bears", FlyingAbility.getInstance(), true); } @@ -46,7 +45,6 @@ public class RuneOfFlightTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Grizzly Bears", FlyingAbility.getInstance(), true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/TyvarKellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/TyvarKellTest.java index 99f76d984f..5a0baf0ce4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/TyvarKellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/TyvarKellTest.java @@ -43,7 +43,6 @@ public class TyvarKellTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 1); // 1x from elf } @@ -82,6 +81,5 @@ public class TyvarKellTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/ValkiGodOfLiesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/ValkiGodOfLiesTest.java index a705bddecf..57581e4ca4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/ValkiGodOfLiesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/ValkiGodOfLiesTest.java @@ -25,7 +25,6 @@ public class ValkiGodOfLiesTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Tibalt, Cosmic Impostor", 1); assertPermanentCount(playerA, "Grizzly Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/VorinclexMonstrousRaiderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/VorinclexMonstrousRaiderTest.java index 2337da1de5..5cfcb421a2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/VorinclexMonstrousRaiderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/VorinclexMonstrousRaiderTest.java @@ -33,7 +33,6 @@ public class VorinclexMonstrousRaiderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(bear, CounterType.P1P1, 4); } @@ -50,7 +49,6 @@ public class VorinclexMonstrousRaiderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(bear, CounterType.P1P1, 4); } @@ -66,7 +64,6 @@ public class VorinclexMonstrousRaiderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, CounterType.POISON, 2); assertCounterCount(playerB, CounterType.POISON, 2); @@ -83,7 +80,6 @@ public class VorinclexMonstrousRaiderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, planeswalker, CounterType.LOYALTY, 4 * 2); } @@ -100,7 +96,6 @@ public class VorinclexMonstrousRaiderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(bear, CounterType.P1P1, 1); } @@ -117,7 +112,6 @@ public class VorinclexMonstrousRaiderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(bear, CounterType.P1P1, 1); } @@ -133,7 +127,6 @@ public class VorinclexMonstrousRaiderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, CounterType.POISON, 0); assertCounterCount(playerB, CounterType.POISON, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ktk/GhostfireBladeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ktk/GhostfireBladeTest.java index 8e2848f646..64d6d693c2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ktk/GhostfireBladeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ktk/GhostfireBladeTest.java @@ -35,7 +35,6 @@ public class GhostfireBladeTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Alpha Myr", 2 + 2, 1 + 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lea/BalanceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lea/BalanceTest.java index a237b94806..1e8aa8bec4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lea/BalanceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lea/BalanceTest.java @@ -23,7 +23,6 @@ public class BalanceTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 2); assertPermanentCount(playerA, "Runeclaw Bear", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/AquitectsWillTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/AquitectsWillTest.java index a22f25f478..a8c5a107f6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/AquitectsWillTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/AquitectsWillTest.java @@ -31,7 +31,6 @@ public class AquitectsWillTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 3); assertGraveyardCount(playerA, will, 1); @@ -56,7 +55,6 @@ public class AquitectsWillTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 3); assertGraveyardCount(playerA, will, 1); @@ -80,7 +78,6 @@ public class AquitectsWillTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, will, 1); assertGraveyardCount(playerA, hexmage, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/AshlingThePilgrimTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/AshlingThePilgrimTest.java index 7dfb3c0c5c..bae8d9194d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/AshlingThePilgrimTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/AshlingThePilgrimTest.java @@ -35,7 +35,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ashling, 0); assertLife(playerA, 17); } @@ -53,7 +52,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ashling, 1); assertCounterCount(ashling, CounterType.P1P1, 4); assertLife(playerA, 20); @@ -75,7 +73,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ashling, 0); assertLife(playerA, 13); } @@ -95,7 +92,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ashling, 1); assertCounterCount(ashling, CounterType.P1P1, 2); assertLife(playerA, 20); @@ -118,7 +114,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ashling, 0); assertLife(playerA, 17); } @@ -137,7 +132,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ashling, 0); assertLife(playerA, 17); } @@ -159,7 +153,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ashling, 0); assertPermanentCount(playerA, slbrt, 0); assertLife(playerA, 17); @@ -179,7 +172,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ashling, 1); assertCounterCount(playerA, ashling, CounterType.P1P1, 2); assertLife(playerA, 20); @@ -203,7 +195,6 @@ public class AshlingThePilgrimTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertManaPool(playerA, ManaType.RED, 0); assertAbility(playerA, slbrt, TrampleAbility.getInstance(), true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m11/InfernoTitanTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m11/InfernoTitanTest.java index 74b0b4212a..6660f179c3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m11/InfernoTitanTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m11/InfernoTitanTest.java @@ -30,7 +30,6 @@ public class InfernoTitanTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Inferno Titan", 1); assertGraveyardCount(playerA, "Grizzly Bears", 1); @@ -56,7 +55,6 @@ public class InfernoTitanTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Inferno Titan", 1); // own in safe assertPermanentCount(playerA, "Grizzly Bears", 1); // own in safe @@ -84,7 +82,6 @@ public class InfernoTitanTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Inferno Titan", 1); // own in safe assertPermanentCount(playerA, "Grizzly Bears", 1); // own in safe diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m11/NecroticPlagueTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m11/NecroticPlagueTest.java index 1a8cb041f2..e986dc86e2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m11/NecroticPlagueTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m11/NecroticPlagueTest.java @@ -25,7 +25,6 @@ public class NecroticPlagueTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -70,7 +69,6 @@ public class NecroticPlagueTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m12/AegisAngelTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m12/AegisAngelTest.java index b330ad64a1..ecf79c70f5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m12/AegisAngelTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m12/AegisAngelTest.java @@ -27,7 +27,6 @@ public class AegisAngelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, lion, IndestructibleAbility.getInstance(), true); } @@ -44,7 +43,6 @@ public class AegisAngelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, lion, IndestructibleAbility.getInstance(), true); } @@ -64,7 +62,6 @@ public class AegisAngelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, angel, 1); assertGraveyardCount(playerA, murder, 1); @@ -86,7 +83,6 @@ public class AegisAngelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, angel, 1); assertGraveyardCount(playerA, murder, 1); @@ -109,7 +105,6 @@ public class AegisAngelTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, act, 1); assertPermanentCount(playerB, angel, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m14/PyromancersGauntletTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m14/PyromancersGauntletTest.java index cd4ee55d5a..b5c0f89239 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m14/PyromancersGauntletTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m14/PyromancersGauntletTest.java @@ -31,7 +31,6 @@ public class PyromancersGauntletTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 15); // Bolt 3 + 2 @@ -66,7 +65,6 @@ public class PyromancersGauntletTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 13); // Attack from Horde 3 + Dmage 2+2 from planeswalker assertLife(playerB, 18); // Damage from planeswalker 2 @@ -105,7 +103,6 @@ public class PyromancersGauntletTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 15); // Attack from Horde 3 + Dmage 2 from planeswalker assertLife(playerB, 18); // Damage from planeswalker 2 diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/AetherGustTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/AetherGustTest.java index b34e46b108..94cbccf9a4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/AetherGustTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/AetherGustTest.java @@ -40,7 +40,6 @@ public class AetherGustTest extends CardTestPlayerBase { assertGraveyardCount(playerA, aetherGust, 1); assertPermanentCount(playerA, barkhide, 0); assertLibraryCount(playerA, 1); - assertAllCommandsUsed(); } @Test @@ -64,6 +63,5 @@ public class AetherGustTest extends CardTestPlayerBase { assertGraveyardCount(playerA, aetherGust, 1); assertPermanentCount(playerA, barkhide, 0); assertLibraryCount(playerA, 1); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/EmbodimentOfAgoniesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/EmbodimentOfAgoniesTest.java index 1f34d80f74..164fca96d1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/EmbodimentOfAgoniesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/EmbodimentOfAgoniesTest.java @@ -24,7 +24,6 @@ public class EmbodimentOfAgoniesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Creature should be 5/5 as there are 5 distinct mana costs in graveyard assertPowerToughness(playerA, "Embodiment of Agonies", 5, 5); @@ -41,7 +40,6 @@ public class EmbodimentOfAgoniesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Creature should be 1/1 as there 1 distinct mana cost in graveyard assertPowerToughness(playerA, "Embodiment of Agonies", 1, 1); @@ -59,7 +57,6 @@ public class EmbodimentOfAgoniesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Creature should be 3/3 as there are 3 distinct mana costs in graveyard assertPowerToughness(playerA, "Embodiment of Agonies", 3, 3); @@ -75,7 +72,6 @@ public class EmbodimentOfAgoniesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Creature should be dead as there are no mana costs in graveyards assertGraveyardCount(playerA, "Embodiment of Agonies", 1); @@ -92,7 +88,6 @@ public class EmbodimentOfAgoniesTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Creature should be 2/2 as there are 2 distinct mana costs in graveyard assertPowerToughness(playerA, "Embodiment of Agonies", 2, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/RepeatedReverberationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/RepeatedReverberationTest.java index 26bab09b4d..d00a942957 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/RepeatedReverberationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m20/RepeatedReverberationTest.java @@ -42,7 +42,6 @@ public class RepeatedReverberationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, ajani, 1); assertGraveyardCount(playerA, repeatedReverb, 1); @@ -76,7 +75,6 @@ public class RepeatedReverberationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, soothingBalm, 1); assertGraveyardCount(playerA, repeatedReverb, 1); @@ -107,7 +105,6 @@ public class RepeatedReverberationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, soulFeast, 1); assertGraveyardCount(playerA, repeatedReverb, 1); @@ -135,7 +132,6 @@ public class RepeatedReverberationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); assertGraveyardCount(playerA, repeatedReverb, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AdherentOfHopeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AdherentOfHopeTest.java index 2dc7fefbf9..bad7ad4412 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AdherentOfHopeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AdherentOfHopeTest.java @@ -20,7 +20,6 @@ public class AdherentOfHopeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Adherent of Hope", CounterType.P1P1, 1); @@ -36,7 +35,6 @@ public class AdherentOfHopeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Adherent of Hope", CounterType.P1P1, 1); @@ -50,7 +48,6 @@ public class AdherentOfHopeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Adherent of Hope", CounterType.P1P1, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlchemistsGiftTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlchemistsGiftTest.java index b2faca78a6..c847e7507a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlchemistsGiftTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlchemistsGiftTest.java @@ -29,7 +29,6 @@ public class AlchemistsGiftTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Adherent of Hope", DeathtouchAbility.getInstance(), true); assertAbility(playerA, "Adherent of Hope", LifelinkAbility.getInstance(), false); @@ -50,7 +49,6 @@ public class AlchemistsGiftTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Adherent of Hope", LifelinkAbility.getInstance(), true); assertAbility(playerA, "Adherent of Hope", DeathtouchAbility.getInstance(), false); assertPowerToughness(playerA, "Adherent of Hope", 3, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlpineHoundmasterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlpineHoundmasterTest.java index 4343c93ba5..bb24539b9a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlpineHoundmasterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AlpineHoundmasterTest.java @@ -26,7 +26,6 @@ public class AlpineHoundmasterTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 1); @@ -49,7 +48,6 @@ public class AlpineHoundmasterTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 1); @@ -73,7 +71,6 @@ public class AlpineHoundmasterTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 2); @@ -94,7 +91,6 @@ public class AlpineHoundmasterTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Alpine Houndmaster", 3, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AngelicAscensionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AngelicAscensionTest.java index 54e29433db..3424b377cd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AngelicAscensionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AngelicAscensionTest.java @@ -22,7 +22,6 @@ public class AngelicAscensionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, 1); assertPermanentCount(playerB, "Angel Token", 1); @@ -40,7 +39,6 @@ public class AngelicAscensionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, 1); assertPermanentCount(playerA, "Angel Token", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AnimalSanctuaryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AnimalSanctuaryTest.java index 445df753fa..dd42be664b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AnimalSanctuaryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AnimalSanctuaryTest.java @@ -27,7 +27,6 @@ public class AnimalSanctuaryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, bird, CounterType.P1P1, 1); } @@ -43,7 +42,6 @@ public class AnimalSanctuaryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, cat, CounterType.P1P1, 1); } @@ -59,7 +57,6 @@ public class AnimalSanctuaryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, dog, CounterType.P1P1, 1); } @@ -75,7 +72,6 @@ public class AnimalSanctuaryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, goat, CounterType.P1P1, 1); } @@ -91,7 +87,6 @@ public class AnimalSanctuaryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, ox, CounterType.P1P1, 1); } @@ -107,7 +102,6 @@ public class AnimalSanctuaryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, snake, CounterType.P1P1, 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AnointedChoristerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AnointedChoristerTest.java index 62a2260329..8b49db187a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AnointedChoristerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AnointedChoristerTest.java @@ -24,7 +24,6 @@ public class AnointedChoristerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(4, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 24); assertLife(playerB, 16); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ArchfiendsVesselTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ArchfiendsVesselTest.java index fac3ac955f..58129be497 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ArchfiendsVesselTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ArchfiendsVesselTest.java @@ -23,7 +23,6 @@ public class ArchfiendsVesselTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Demon Token", 1); assertPermanentCount(playerA, archfiendsVessel, 0); @@ -46,7 +45,6 @@ public class ArchfiendsVesselTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Demon Token", 1); assertPermanentCount(playerA, archfiendsVessel, 0); @@ -71,7 +69,6 @@ public class ArchfiendsVesselTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Demon Token", 0); assertPermanentCount(playerA, archfiendsVessel, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AvenGagglemasterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AvenGagglemasterTest.java index 34216dd83f..84fe83c2c2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AvenGagglemasterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AvenGagglemasterTest.java @@ -18,7 +18,6 @@ public class AvenGagglemasterTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 22); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BadDealTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BadDealTest.java index a5fcd14856..9715ac643c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BadDealTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BadDealTest.java @@ -20,7 +20,6 @@ public class BadDealTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 18); assertLife(playerB, 18); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BarrinTolarianArchmageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BarrinTolarianArchmageTest.java index 2f24a8502b..e3d08cd2a0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BarrinTolarianArchmageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BarrinTolarianArchmageTest.java @@ -23,7 +23,6 @@ public class BarrinTolarianArchmageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // At the beginning of your end step, if a permanent was put into your hand from the battlefield this turn, draw a card. assertHandCount(playerA, 2); @@ -43,7 +42,6 @@ public class BarrinTolarianArchmageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // At the beginning of your end step, if a permanent was put into your hand from the battlefield this turn, draw a card. assertHandCount(playerA, 2); @@ -63,7 +61,6 @@ public class BarrinTolarianArchmageTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // At the beginning of your end step, if a permanent was put into your hand from the battlefield this turn, draw a card. assertHandCount(playerA, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriDevotedPaladinTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriDevotedPaladinTest.java index 4c17af06e7..7ec8c99803 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriDevotedPaladinTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriDevotedPaladinTest.java @@ -28,7 +28,6 @@ public class BasriDevotedPaladinTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Savannah Lions", VigilanceAbility.getInstance(), true); assertCounterCount(playerA, "Savannah Lions", CounterType.P1P1, 1); @@ -47,7 +46,6 @@ public class BasriDevotedPaladinTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 17); assertCounterCount(playerA, "Savannah Lions", CounterType.P1P1, 1); @@ -73,7 +71,6 @@ public class BasriDevotedPaladinTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Savannah Lions", 6, 5); assertAbility(playerA, "Savannah Lions", FlyingAbility.getInstance(), true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriKetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriKetTest.java index c5baeb4668..22849536b1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriKetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriKetTest.java @@ -23,7 +23,6 @@ public class BasriKetTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Grizzly Bears", CounterType.P1P1, 1); assertAbility(playerA, "Grizzly Bears", IndestructibleAbility.getInstance(), true); @@ -40,7 +39,6 @@ public class BasriKetTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerB, 17); assertPermanentCount(playerA, "Soldier Token", 1); @@ -67,7 +65,6 @@ public class BasriKetTest extends CardTestPlayerBase { setStopAt(7, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerB, 14); assertPermanentCount(playerA, "Soldier Token", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAcolyteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAcolyteTest.java index fa9bee3694..f845e30534 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAcolyteTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAcolyteTest.java @@ -22,7 +22,6 @@ public class BasrisAcolyteTest extends CardTestPlayerBase { addTarget(playerA, "Grizzly Bears^Savannah Lions"); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Grizzly Bears", CounterType.P1P1, 1); assertCounterCount(playerA, "Savannah Lions", CounterType.P1P1, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAegisTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAegisTest.java index 76cc010237..13dc72f8fa 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAegisTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisAegisTest.java @@ -24,7 +24,6 @@ public class BasrisAegisTest extends CardTestPlayerBase { addTarget(playerA, "Basri, Devoted Paladin"); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 1); assertCounterCount(playerA, "Grizzly Bears", CounterType.P1P1, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisLieutenantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisLieutenantTest.java index b1ee80c379..e749537a26 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisLieutenantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisLieutenantTest.java @@ -26,7 +26,6 @@ public class BasrisLieutenantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Knight Token", 1); } @@ -49,7 +48,6 @@ public class BasrisLieutenantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Knight Token", 1); } @@ -72,7 +70,6 @@ public class BasrisLieutenantTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Knight Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisSolidarityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisSolidarityTest.java index cd97cef234..ca2b0fa3f0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisSolidarityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisSolidarityTest.java @@ -23,7 +23,6 @@ public class BasrisSolidarityTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Savannah Lions", CounterType.P1P1, 1); assertCounterCount(playerA, "Scryb Sprites", CounterType.P1P1, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BoltHoundTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BoltHoundTest.java index 0e6b1c4c4f..91f26ed478 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BoltHoundTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BoltHoundTest.java @@ -20,7 +20,6 @@ public class BoltHoundTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 16); assertPowerToughness(playerA, "Bolt Hound", 2,2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BonePitBruteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BonePitBruteTest.java index 4d663d9ee3..15965f23a6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BonePitBruteTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BonePitBruteTest.java @@ -20,7 +20,6 @@ public class BonePitBruteTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Bone Pit Brute", 8, 5); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BrashTaunterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BrashTaunterTest.java index 12f4da25f5..9748f36eb9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BrashTaunterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BrashTaunterTest.java @@ -22,7 +22,6 @@ public class BrashTaunterTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 2); } @@ -41,7 +40,6 @@ public class BrashTaunterTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 - 2); } @@ -60,7 +58,6 @@ public class BrashTaunterTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 16); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BurlfistOakTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BurlfistOakTest.java index beae34ae95..28750eedb0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BurlfistOakTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BurlfistOakTest.java @@ -17,7 +17,6 @@ public class BurlfistOakTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Burlfist Oak", 4, 5); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BurnBrightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BurnBrightTest.java index caa23398e2..36514cebb2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BurnBrightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BurnBrightTest.java @@ -22,7 +22,6 @@ public class BurnBrightTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Raging Goblin", 3, 1); assertPowerToughness(playerA, "Scryb Sprites", 3, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CagedZombieTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CagedZombieTest.java index 593c143f17..971bcbaadc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CagedZombieTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CagedZombieTest.java @@ -24,7 +24,6 @@ public class CagedZombieTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 18); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CancelTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CancelTest.java index 184c466b5e..0570f0e16b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CancelTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CancelTest.java @@ -20,7 +20,6 @@ public class CancelTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Grizzly Bears", 1); assertGraveyardCount(playerA, "Cancel", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CanopyStalkerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CanopyStalkerTest.java index 42b45826be..041fde8fdb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CanopyStalkerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CanopyStalkerTest.java @@ -20,7 +20,6 @@ public class CanopyStalkerTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Scryb Sprites", 1); @@ -39,7 +38,6 @@ public class CanopyStalkerTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 22); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CaptureSphereTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CaptureSphereTest.java index 2adf9ca81d..5b310230ee 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CaptureSphereTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CaptureSphereTest.java @@ -22,7 +22,6 @@ public class CaptureSphereTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(4, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertTapped("Grizzly Bears", true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CarrionGrubTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CarrionGrubTest.java index 7f0f60a6a0..4d36083c91 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CarrionGrubTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CarrionGrubTest.java @@ -20,7 +20,6 @@ public class CarrionGrubTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA , 4); @@ -35,7 +34,6 @@ public class CarrionGrubTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Carrion Grub", 4, 5); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CelestialEnforcerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CelestialEnforcerTest.java index 69fc06a0ea..279353a1be 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CelestialEnforcerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CelestialEnforcerTest.java @@ -18,7 +18,6 @@ public class CelestialEnforcerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertTapped("Grizzly Bears", true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasIncineratorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasIncineratorTest.java index 1d35e5dd5b..ef5cf4d628 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasIncineratorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasIncineratorTest.java @@ -23,7 +23,6 @@ public class ChandrasIncineratorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); // {R} lightning bolt + {2}{R} Chandra's Incinerator assertTappedCount("Mountain", true, 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasMagmuttTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasMagmuttTest.java index 6a2fb2d949..fb3a19e7e6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasMagmuttTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasMagmuttTest.java @@ -18,7 +18,6 @@ public class ChandrasMagmuttTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerB, 19); } @@ -36,7 +35,6 @@ public class ChandrasMagmuttTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCounterCount("Basri Ket", CounterType.LOYALTY, 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasPyrelingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasPyrelingTest.java index fe4c470e76..9582686a13 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasPyrelingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChandrasPyrelingTest.java @@ -20,7 +20,6 @@ public class ChandrasPyrelingTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Chandra's Pyreling", DoubleStrikeAbility.getInstance(), true); assertPowerToughness(playerA, "Chandra's Pyreling", 2, 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromaticOrreryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromaticOrreryTest.java index 978deae3b8..b7a0778161 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromaticOrreryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromaticOrreryTest.java @@ -19,7 +19,6 @@ public class ChromaticOrreryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Sliver Overlord", 1); } @@ -37,7 +36,6 @@ public class ChromaticOrreryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 5); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromeReplicatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromeReplicatorTest.java index aefb5b59ed..3c7976c2c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromeReplicatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromeReplicatorTest.java @@ -20,7 +20,6 @@ public class ChromeReplicatorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Construct Token", 1); } @@ -37,7 +36,6 @@ public class ChromeReplicatorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Construct Token", 0); } @@ -58,7 +56,6 @@ public class ChromeReplicatorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Construct Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ConclaveMentorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ConclaveMentorTest.java index 7b67f43dfa..5f979bb746 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ConclaveMentorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ConclaveMentorTest.java @@ -22,7 +22,6 @@ public class ConclaveMentorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Conclave Mentor", CounterType.P1P1, 2); @@ -44,7 +43,6 @@ public class ConclaveMentorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerA, 25); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ConspicuousSnoopTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ConspicuousSnoopTest.java index d9424400c9..047728ce55 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ConspicuousSnoopTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ConspicuousSnoopTest.java @@ -17,7 +17,6 @@ public class ConspicuousSnoopTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertTopCardRevealed(playerA, true); } @@ -44,7 +43,6 @@ public class ConspicuousSnoopTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Goblin Lackey", 1); } @@ -65,7 +63,6 @@ public class ConspicuousSnoopTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertAbilityCount(playerA, "Conspicuous Snoop", ActivatedAbility.class, 3); // (2 X casts + gains flying ) } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ContainmentPriestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ContainmentPriestTest.java index c609c1503a..8137356e24 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ContainmentPriestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ContainmentPriestTest.java @@ -24,7 +24,6 @@ public class ContainmentPriestTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, "Grizzly Bears", 1); assertExileCount(playerB, "Scryb Sprites", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CrashThroughTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CrashThroughTest.java index 78924a509d..c4346264d5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CrashThroughTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/CrashThroughTest.java @@ -21,7 +21,6 @@ public class CrashThroughTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Grizzly Bears", TrampleAbility.getInstance(), true); assertAbility(playerB, "Scryb Sprites", TrampleAbility.getInstance(), false); assertHandCount(playerA, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DaybreakChargerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DaybreakChargerTest.java index 778428e8c4..f47d0ba8af 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DaybreakChargerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DaybreakChargerTest.java @@ -18,7 +18,6 @@ public class DaybreakChargerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Daybreak Charger", 5, 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DeathbloomThallidTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DeathbloomThallidTest.java index 7074b44a10..cd245194c4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DeathbloomThallidTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DeathbloomThallidTest.java @@ -18,7 +18,6 @@ public class DeathbloomThallidTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Saproling Token", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java index 070b98ef56..9edd2e02d5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java @@ -21,7 +21,6 @@ public class DireFleetWarmongerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Dire Fleet Warmonger", 5, 5); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DiscontinuityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DiscontinuityTest.java index a184fe8781..d114427370 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DiscontinuityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DiscontinuityTest.java @@ -18,7 +18,6 @@ public class DiscontinuityTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTappedCount("Island", true, 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DoubleVisionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DoubleVisionTest.java index f4fb58cb75..968402d20b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DoubleVisionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DoubleVisionTest.java @@ -21,7 +21,6 @@ public class DoubleVisionTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertLife(playerB, 16); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DubTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DubTest.java index 3a5fcce2ce..a1c6a91564 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DubTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DubTest.java @@ -22,7 +22,6 @@ public class DubTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertAbility(playerA, "Scryb Sprites", FirstStrikeAbility.getInstance(), true); assertAbility(playerA, "Scryb Sprites", FlyingAbility.getInstance(), true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ElderGargarothTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ElderGargarothTest.java index 7636054033..f4cd194faa 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ElderGargarothTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ElderGargarothTest.java @@ -21,7 +21,6 @@ public class ElderGargarothTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Beast Token", 1); } @@ -37,7 +36,6 @@ public class ElderGargarothTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 23); } @@ -54,7 +52,6 @@ public class ElderGargarothTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EliminateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EliminateTest.java index 6b1dcb4b80..77f99e007b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EliminateTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EliminateTest.java @@ -17,7 +17,6 @@ public class EliminateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Ancient Crab", 1); } @@ -31,7 +30,6 @@ public class EliminateTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Basri Ket", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EnthrallingHoldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EnthrallingHoldTest.java index bb5c5f4f13..1d135208a1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EnthrallingHoldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/EnthrallingHoldTest.java @@ -34,7 +34,6 @@ public class EnthrallingHoldTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Traxos, Scourge of Kroog", 0); assertPermanentCount(playerA, "Traxos, Scourge of Kroog", 1); @@ -67,7 +66,6 @@ public class EnthrallingHoldTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Traxos, Scourge of Kroog", 0); assertPermanentCount(playerA, "Traxos, Scourge of Kroog", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ExperimentalOverloadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ExperimentalOverloadTest.java index df135f8923..10c2e34349 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ExperimentalOverloadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ExperimentalOverloadTest.java @@ -23,7 +23,6 @@ public class ExperimentalOverloadTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Shock",1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FalconerAdeptTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FalconerAdeptTest.java index e8e7d9673e..ca52c8de05 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FalconerAdeptTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FalconerAdeptTest.java @@ -15,7 +15,6 @@ public class FalconerAdeptTest extends CardTestPlayerBase { attack(3, playerA, "Falconer Adept"); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 17); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FieryEmancipationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FieryEmancipationTest.java index f3eead8c81..7836080933 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FieryEmancipationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FieryEmancipationTest.java @@ -17,7 +17,6 @@ public class FieryEmancipationTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 14); } @@ -32,7 +31,6 @@ public class FieryEmancipationTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", "Basri Ket"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Basri Ket", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FinishingBlowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FinishingBlowTest.java index 6d2d3a0269..b68fcdec4c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FinishingBlowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FinishingBlowTest.java @@ -19,7 +19,6 @@ public class FinishingBlowTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Grizzly Bears", 1); } @@ -35,7 +34,6 @@ public class FinishingBlowTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Basri Ket", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ForgottenSentinelTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ForgottenSentinelTest.java index 3dabe5eb0d..2b0361455d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ForgottenSentinelTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ForgottenSentinelTest.java @@ -16,7 +16,6 @@ public class ForgottenSentinelTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertTapped("Forgotten Sentinel", true); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FranticInventoryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FranticInventoryTest.java index 7985cf786a..45633432a5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FranticInventoryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FranticInventoryTest.java @@ -17,7 +17,6 @@ public class FranticInventoryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FrostBreathTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FrostBreathTest.java index 1f833edec5..0f6fd0241b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FrostBreathTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FrostBreathTest.java @@ -21,7 +21,6 @@ public class FrostBreathTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertTapped("Grizzly Bears", true); assertTapped("Serra Angel", true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FungalRebirthTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FungalRebirthTest.java index 6456aa4672..cc06d1f3f0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FungalRebirthTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FungalRebirthTest.java @@ -23,7 +23,6 @@ public class FungalRebirthTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Saproling Token", 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/HoodedBlightfangTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/HoodedBlightfangTest.java index 29d83f6c5e..a51fb799b5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/HoodedBlightfangTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/HoodedBlightfangTest.java @@ -21,7 +21,6 @@ public class HoodedBlightfangTest extends CardTestPlayerBase { attack(1, playerA, goblin); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 + 1); assertLife(playerB, 20 - 1 - 1); @@ -37,7 +36,6 @@ public class HoodedBlightfangTest extends CardTestPlayerBase { attack(1, playerA, goblin, jace); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, jace, 0); assertGraveyardCount(playerB, jace, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/IdolOfEnduranceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/IdolOfEnduranceTest.java index 60399bbefa..fe6018b5dd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/IdolOfEnduranceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/IdolOfEnduranceTest.java @@ -45,7 +45,6 @@ public class IdolOfEnduranceTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, sqr, 1); } @@ -100,7 +99,6 @@ public class IdolOfEnduranceTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, sqr, 1); assertPermanentCount(playerA, idol, 0); @@ -128,7 +126,6 @@ public class IdolOfEnduranceTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, bnyrdwrm, 1); assertPermanentCount(playerA, idol, 0); @@ -163,7 +160,6 @@ public class IdolOfEnduranceTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, sqr, 1); assertPermanentCount(playerA, glrskr, 1); @@ -194,7 +190,6 @@ public class IdolOfEnduranceTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, sqr, 1); assertPermanentCount(playerA, glrskr, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh1/LavaDartTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh1/LavaDartTest.java index e11fb02c43..f2b9d12e3f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh1/LavaDartTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh1/LavaDartTest.java @@ -23,7 +23,6 @@ public class LavaDartTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/DauthiVoidwalkerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/DauthiVoidwalkerTest.java index f126aa3045..7c81f69815 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/DauthiVoidwalkerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/DauthiVoidwalkerTest.java @@ -37,7 +37,6 @@ public class DauthiVoidwalkerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -70,7 +69,6 @@ public class DauthiVoidwalkerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20 - 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GarthOneEyeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GarthOneEyeTest.java index 1a5b37fc0a..9b0d2bcc37 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GarthOneEyeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GarthOneEyeTest.java @@ -36,7 +36,6 @@ public class GarthOneEyeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(garth, true); assertTapped("Plains", true); @@ -59,7 +58,6 @@ public class GarthOneEyeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(garth, true); assertTapped("Island", true); @@ -81,7 +79,6 @@ public class GarthOneEyeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(garth, true); assertTapped("Swamp", true); @@ -100,7 +97,6 @@ public class GarthOneEyeTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(garth, true); assertTapped("Mountain", true); @@ -123,7 +119,6 @@ public class GarthOneEyeTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(garth, true); assertTapped("Forest", true); @@ -141,7 +136,6 @@ public class GarthOneEyeTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped(garth, true); Permanent permanent = getPermanent(lotus); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java index 17ad098fef..6ccb9cd0c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java @@ -28,7 +28,6 @@ public class GristTheHungerTideTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); for (Card card : currentGame.getCards()) { if (!card.getName().equals(grist)) { @@ -55,7 +54,6 @@ public class GristTheHungerTideTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); for (Card card : currentGame.getCards()) { if (!card.getName().equals(grist)) { @@ -77,7 +75,6 @@ public class GristTheHungerTideTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); // Grist is a creature spell when cast and triggers bounty assertPermanentCount(playerA, "Beast Token", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/ZabazTheGlimmerwaspTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/ZabazTheGlimmerwaspTest.java index 89870d787e..4be7f89e6a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/ZabazTheGlimmerwaspTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/ZabazTheGlimmerwaspTest.java @@ -25,7 +25,6 @@ public class ZabazTheGlimmerwaspTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, worker, 1, 1); assertPowerToughness(playerA, zabaz, 1, 1); @@ -48,7 +47,6 @@ public class ZabazTheGlimmerwaspTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, worker, 1); assertPowerToughness(playerA, zabaz, 1 + 1 + 1, 1 + 1 + 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mmq/CallerOfTheHuntTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mmq/CallerOfTheHuntTest.java index acf689217e..ef06fb8e31 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mmq/CallerOfTheHuntTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mmq/CallerOfTheHuntTest.java @@ -29,7 +29,6 @@ public class CallerOfTheHuntTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Caller of the Hunt", 1); assertPowerToughness(playerA, "Caller of the Hunt", 3, 3); // +3 boost @@ -52,7 +51,6 @@ public class CallerOfTheHuntTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Caller of the Hunt", 1); assertPowerToughness(playerA, "Caller of the Hunt", 3, 3); // +3 boost diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mmq/MisdirectionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mmq/MisdirectionTest.java index 5ca86a8554..8c490aa7aa 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mmq/MisdirectionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mmq/MisdirectionTest.java @@ -34,7 +34,6 @@ public class MisdirectionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -56,7 +55,6 @@ public class MisdirectionTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Boomerang", 1); assertPermanentCount(playerA, "Ashcoat Bear", 0); @@ -94,7 +92,6 @@ public class MisdirectionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Rakshasa's Secret", 1); assertGraveyardCount(playerB, "Misdirection", 1); @@ -125,7 +122,6 @@ public class MisdirectionTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Public Execution", 1); assertGraveyardCount(playerB, "Misdirection", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/ChaliceOfTheVoidTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/ChaliceOfTheVoidTest.java index f4dbc5cc8f..b82b7ed400 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/ChaliceOfTheVoidTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/ChaliceOfTheVoidTest.java @@ -33,7 +33,6 @@ public class ChaliceOfTheVoidTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Chalice of the Void", 2); @@ -91,7 +90,6 @@ public class ChaliceOfTheVoidTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertExileCount(playerB, "Conflagrate", 1); //TODO: Apparently there are two mountains in the graveyard at the end of the test now. diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ncc/JoleneThePlunderQueenTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ncc/JoleneThePlunderQueenTest.java index 766d16c712..90d42b1d50 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ncc/JoleneThePlunderQueenTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ncc/JoleneThePlunderQueenTest.java @@ -51,7 +51,6 @@ public class JoleneThePlunderQueenTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); // 1 attack trigger, +1 Treasure with the replacement effect. assertPermanentCount(playerA, "Treasure Token", 2); @@ -76,7 +75,6 @@ public class JoleneThePlunderQueenTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); // 1 attack trigger, not controlling Jolene so no replacement effect. assertPermanentCount(playerA, "Treasure Token", 1); @@ -99,7 +97,6 @@ public class JoleneThePlunderQueenTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); // no trigger, no token. assertPermanentCount(playerA, "Treasure Token", 0); @@ -125,7 +122,6 @@ public class JoleneThePlunderQueenTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.DECLARE_BLOCKERS); execute(); - assertAllCommandsUsed(); // 3 triggers (1 for each Jolene), +1 Treasure for each with the replacement effect. assertPermanentCount(playerA, "Treasure Token", 6); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ncc/SmugglersShareTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ncc/SmugglersShareTest.java index 747be86a0f..d64b264a57 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ncc/SmugglersShareTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ncc/SmugglersShareTest.java @@ -112,7 +112,6 @@ public class SmugglersShareTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.CLEANUP); execute(); - assertAllCommandsUsed(); // 2 lands entered the battlefield under opponent's control, create Treasure token. assertPermanentCount(playerB, treasureToken, 1); @@ -143,7 +142,6 @@ public class SmugglersShareTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.CLEANUP); execute(); - assertAllCommandsUsed(); // More than 2 cards were drawn by an opponent, draw a card. assertHandCount(playerB, 1); @@ -180,7 +178,6 @@ public class SmugglersShareTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.CLEANUP); execute(); - assertAllCommandsUsed(); // 2 lands entered the battlefield under opponent's control, create Treasure token. assertPermanentCount(playerB, treasureToken, 1); @@ -236,7 +233,6 @@ public class SmugglersShareTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.CLEANUP); execute(); - assertAllCommandsUsed(); // 2 lands entered the battlefield for 2 different opponents, create 2 Treasure tokens. assertPermanentCount(playerD, treasureToken, 2); @@ -282,7 +278,6 @@ public class SmugglersShareTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); // 1 card drawn for turn assertHandCount(playerA, 1); @@ -291,7 +286,6 @@ public class SmugglersShareTest extends CardTestCommander4Players { setStopAt(1, PhaseStep.CLEANUP); execute(); - assertAllCommandsUsed(); // 2 lands entered the battlefield under opponent's control, create Treasure token. assertPermanentCount(playerA, treasureToken, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java index 7830747565..e79294fd32 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java @@ -34,7 +34,6 @@ public class StoryweaveTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, fang, CounterType.P1P1, 2); assertCounterCount(playerA, colossus, CounterType.P1P1, 0); @@ -53,7 +52,6 @@ public class StoryweaveTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, fang, CounterType.P1P1, 0); assertPermanentCount(playerA, "Centaur Token", 2); @@ -78,7 +76,6 @@ public class StoryweaveTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, fang, CounterType.P1P1, 2); assertPermanentCount(playerA, "Centaur Token", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/nph/NornsAnnexTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/nph/NornsAnnexTest.java index 141e83d7ab..35ceb8bbc9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/nph/NornsAnnexTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/nph/NornsAnnexTest.java @@ -25,7 +25,6 @@ public class NornsAnnexTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 18); assertLife(playerB, 18); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/pc2/FracturedPowerstoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/pc2/FracturedPowerstoneTest.java index 35cc75b5d6..d2b1b69228 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/pc2/FracturedPowerstoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/pc2/FracturedPowerstoneTest.java @@ -25,7 +25,6 @@ public class FracturedPowerstoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 2); assertTappedCount("Fractured Powerstone", true, 1); @@ -53,7 +52,6 @@ public class FracturedPowerstoneTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Eldrazi Token", 3); assertTappedCount("Mountain", true, 1); // cost for second planar die diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/rix/ReleaseToTheWindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/rix/ReleaseToTheWindTest.java index fc0f082765..10d6f1393a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/rix/ReleaseToTheWindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/rix/ReleaseToTheWindTest.java @@ -32,7 +32,6 @@ public class ReleaseToTheWindTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Grizzly Bears", 1); } @@ -69,7 +68,6 @@ public class ReleaseToTheWindTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Akoum Warrior", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/rna/PteramanderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/rna/PteramanderTest.java index 62a1f36ccb..bc69a09b08 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/rna/PteramanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/rna/PteramanderTest.java @@ -19,7 +19,6 @@ public class PteramanderTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Pteramander", 5, 5); } @@ -34,7 +33,6 @@ public class PteramanderTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Pteramander", 5, 5); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/NivmagusElementalTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/NivmagusElementalTest.java index e51478c935..e2acbc60f9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/NivmagusElementalTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/NivmagusElementalTest.java @@ -26,7 +26,6 @@ public class NivmagusElementalTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, nivmagus, CounterType.P1P1, 2); assertLife(playerB, 20); @@ -49,7 +48,6 @@ public class NivmagusElementalTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, nivmagus, CounterType.P1P1, 6); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/scg/DecreeOfPainTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/scg/DecreeOfPainTest.java index 09b3c97bfe..79bafd1d4e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/scg/DecreeOfPainTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/scg/DecreeOfPainTest.java @@ -38,7 +38,6 @@ public class DecreeOfPainTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Decree of Pain"); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Xyris, the Writhing Storm", 1); assertGraveyardCount(playerB, "Aven Envoy", 9); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/snc/UnlicensedHearseTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/snc/UnlicensedHearseTest.java index f64307421c..b77412022f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/snc/UnlicensedHearseTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/snc/UnlicensedHearseTest.java @@ -42,7 +42,6 @@ public class UnlicensedHearseTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, 1); assertPowerToughness(playerA, "Unlicensed Hearse", 1, 1); @@ -60,7 +59,6 @@ public class UnlicensedHearseTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, 0); assertPowerToughness(playerA, "Unlicensed Hearse", 2, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/GameTrailTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/GameTrailTest.java index 31c7a7001f..ab65d9d83b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/GameTrailTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/GameTrailTest.java @@ -26,7 +26,6 @@ public class GameTrailTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Game Trail", false); } @@ -45,7 +44,6 @@ public class GameTrailTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Game Trail", true); } @@ -65,7 +63,6 @@ public class GameTrailTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Game Trail", true); } @@ -100,7 +97,6 @@ public class GameTrailTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("Game Trail", false); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/LambholtPacifistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/LambholtPacifistTest.java index 8fed30ea4c..73e60b5842 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/LambholtPacifistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/LambholtPacifistTest.java @@ -52,7 +52,6 @@ public class LambholtPacifistTest extends CardTestPlayerBase { try { execute(); - assertAllCommandsUsed(); } catch (Throwable e) { if (!e.getMessage().contains("Player PlayerA must have 0 actions but found 1")) { Assert.fail("Should have had error about not being able to attack, but got:\n" + e.getMessage()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/som/NimDeathmantleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/som/NimDeathmantleTest.java index 44104a5f8c..9b5344850a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/som/NimDeathmantleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/som/NimDeathmantleTest.java @@ -37,8 +37,6 @@ public class NimDeathmantleTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerB, "Lightning Bolt",1); assertPermanentCount(playerA, "Nim Deathmantle", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/BalefulMasteryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/BalefulMasteryTest.java index dd3e67df39..31ea57ee99 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/BalefulMasteryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/BalefulMasteryTest.java @@ -27,7 +27,6 @@ public class BalefulMasteryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertHandCount(playerB, 0); @@ -52,7 +51,6 @@ public class BalefulMasteryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertHandCount(playerB, 1); // +1 from cost's draw @@ -82,7 +80,6 @@ public class BalefulMasteryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, 0); assertHandCount(playerB, 1); @@ -134,7 +131,6 @@ public class BalefulMasteryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -177,6 +173,5 @@ public class BalefulMasteryTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/DaemogothTitanTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/DaemogothTitanTest.java index 3c1c9209d0..5e41c55700 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/DaemogothTitanTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/DaemogothTitanTest.java @@ -22,7 +22,6 @@ public class DaemogothTitanTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 11); assertGraveyardCount(playerA, "Grizzly Bears", 1); @@ -39,7 +38,6 @@ public class DaemogothTitanTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 11); assertGraveyardCount(playerA, "Grizzly Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/EmergentSequenceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/EmergentSequenceTest.java index 1d2147a350..0d85c4adb4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/EmergentSequenceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/EmergentSequenceTest.java @@ -32,7 +32,6 @@ public class EmergentSequenceTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertType("Swamp", CardType.CREATURE, true); assertCounterCount(playerA, "Swamp", CounterType.P1P1, 1); @@ -63,7 +62,6 @@ public class EmergentSequenceTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Island", 1); assertType("Swamp", CardType.CREATURE, true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/PlumbTheForbiddenTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/PlumbTheForbiddenTest.java index 323b578d48..6ca9dfe229 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/PlumbTheForbiddenTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/PlumbTheForbiddenTest.java @@ -28,7 +28,6 @@ public class PlumbTheForbiddenTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, bear, 1); assertGraveyardCount(playerA, lion, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/RadiantScrollwielderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/RadiantScrollwielderTest.java index 60990fafb7..12eda551bd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/RadiantScrollwielderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/RadiantScrollwielderTest.java @@ -24,7 +24,6 @@ public class RadiantScrollwielderTest extends CardTestPlayerBase { // setStrictChooseMode(true); currently doesn't work as computer player doesn't allow random targeting setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20 + 3); assertLife(playerB, 20 - 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/ShowOfConfidenceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/ShowOfConfidenceTest.java index 69ef3e359f..ccaa03dad1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/ShowOfConfidenceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/ShowOfConfidenceTest.java @@ -65,7 +65,6 @@ public class ShowOfConfidenceTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(playerA, "Balduvian Bears", CounterType.P1P1, 4); assertAbility(playerA, "Balduvian Bears", VigilanceAbility.getInstance(), true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/StarPupilTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/StarPupilTest.java index 807e93782c..74b1a4abd5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/StarPupilTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/stx/StarPupilTest.java @@ -27,7 +27,6 @@ public class StarPupilTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertCounterCount(lion, CounterType.P1P1, 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tmp/KnightOfDuskTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tmp/KnightOfDuskTest.java index 8240c3592c..a1f3e2675b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/tmp/KnightOfDuskTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tmp/KnightOfDuskTest.java @@ -28,7 +28,6 @@ public class KnightOfDuskTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, knight, 1); assertPermanentCount(playerB, lion, 0); @@ -52,7 +51,6 @@ public class KnightOfDuskTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, knight, 0); assertPermanentCount(playerB, lion, 0); @@ -76,7 +74,6 @@ public class KnightOfDuskTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, knight, 1); assertPermanentCount(playerB, lion, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tor/RadiateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tor/RadiateTest.java index feb3555b2d..e991f410b4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/tor/RadiateTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tor/RadiateTest.java @@ -37,7 +37,6 @@ public class RadiateTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, 6); // 6 lands assertPermanentCount(playerB, 0); @@ -70,7 +69,6 @@ public class RadiateTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, 6); // 6 lands assertPermanentCount(playerB, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/GauntletOfPowerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/GauntletOfPowerTest.java index 496d760a1e..59773cf232 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/GauntletOfPowerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/GauntletOfPowerTest.java @@ -28,7 +28,6 @@ public class GauntletOfPowerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, maaka, 2 + 1, 2 + 1); assertPowerToughness(playerA, myr, 1, 2); @@ -47,7 +46,6 @@ public class GauntletOfPowerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, maaka, 2 + 1, 2 + 1); } @@ -67,7 +65,6 @@ public class GauntletOfPowerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerB, maaka, 2 + 1, 2 + 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/WeatherseedTotemTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/WeatherseedTotemTest.java index adf7bfcdec..14527c7c91 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/WeatherseedTotemTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/WeatherseedTotemTest.java @@ -23,7 +23,6 @@ public class WeatherseedTotemTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, totem, 0); assertGraveyardCount(playerA, totem, 1); @@ -43,7 +42,6 @@ public class WeatherseedTotemTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, totem, 1); assertGraveyardCount(playerA, totem, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsr/ShivanSandMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsr/ShivanSandMageTest.java index 3256fac646..23c9bb02df 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsr/ShivanSandMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsr/ShivanSandMageTest.java @@ -27,7 +27,6 @@ public class ShivanSandMageTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Shivan Sand-Mage", 1); } @@ -47,7 +46,6 @@ public class ShivanSandMageTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Shivan Sand-Mage", 1); } @@ -80,7 +78,6 @@ public class ShivanSandMageTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Shivan Sand-Mage", 1); } @@ -114,7 +111,6 @@ public class ShivanSandMageTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Shivan Sand-Mage", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ulg/GoblinWelderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ulg/GoblinWelderTest.java index b245d8e08e..cf8b4e2e49 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ulg/GoblinWelderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ulg/GoblinWelderTest.java @@ -36,7 +36,6 @@ public class GoblinWelderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, wurmcoil, 1); assertPermanentCount(playerA, relic, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/vis/DesertionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/vis/DesertionTest.java index 55f8ac9267..06062b0d93 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/vis/DesertionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/vis/DesertionTest.java @@ -30,7 +30,6 @@ public class DesertionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Grizzly Bears", 1); assertGraveyardCount(playerA, "Desertion", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/vow/SaviorOfOllenbockTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/vow/SaviorOfOllenbockTest.java index 7ae499f98b..da6cff7847 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/vow/SaviorOfOllenbockTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/vow/SaviorOfOllenbockTest.java @@ -26,7 +26,6 @@ public class SaviorOfOllenbockTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, lion, 1); } @@ -44,7 +43,6 @@ public class SaviorOfOllenbockTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertExileCount(playerA, bear, 1); } @@ -65,7 +63,6 @@ public class SaviorOfOllenbockTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, savior, 0); assertPermanentCount(playerA, lion, 1); @@ -89,7 +86,6 @@ public class SaviorOfOllenbockTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, savior, 0); assertPermanentCount(playerA, lion, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/war/GodEternalKefnetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/war/GodEternalKefnetTest.java index 396cbb8be8..b69d2f0e5f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/war/GodEternalKefnetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/war/GodEternalKefnetTest.java @@ -36,7 +36,6 @@ public class GodEternalKefnetTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Precision Bolt", 1); assertGraveyardCount(playerA, "Precision Bolt", 0); @@ -70,7 +69,6 @@ public class GodEternalKefnetTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Fire // Ice", 1); assertGraveyardCount(playerA, "Fire // Ice", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/war/MobilizedDistrictTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/war/MobilizedDistrictTest.java index ed82dfb381..1897301eea 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/war/MobilizedDistrictTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/war/MobilizedDistrictTest.java @@ -20,7 +20,6 @@ public class MobilizedDistrictTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Mobilized District", 3, 3); } @@ -45,7 +44,6 @@ public class MobilizedDistrictTest extends CardTestPlayerBase { setStopAt(5, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Mobilized District", 3, 3); assertTappedCount("Mobilized District", true, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java index 7c2daef4d3..3b7ffbba60 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java @@ -34,6 +34,5 @@ public class TreasureCoveTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/ArchiveTrapTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/ArchiveTrapTest.java index 01e0b0b4bb..c09fabacdf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/ArchiveTrapTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/ArchiveTrapTest.java @@ -43,7 +43,6 @@ public class ArchiveTrapTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLibraryCount(playerA, 15 - 1 - 13); // -1 by search, -13 by trap's mill } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/BlazingTorchTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/BlazingTorchTest.java index cefe8edf40..bb836c8716 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/BlazingTorchTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/BlazingTorchTest.java @@ -28,7 +28,6 @@ public class BlazingTorchTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 18); @@ -55,7 +54,6 @@ public class BlazingTorchTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 18); @@ -83,7 +81,6 @@ public class BlazingTorchTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); // Ability resolves as it's from the equipped creature but damage is from torch and is prevented diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/znr/AshayaSoulOfTheWildTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/znr/AshayaSoulOfTheWildTest.java index c6af06ff1d..ac7f15f028 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/znr/AshayaSoulOfTheWildTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/znr/AshayaSoulOfTheWildTest.java @@ -31,8 +31,6 @@ public class AshayaSoulOfTheWildTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertType(ashaya, CardType.LAND, SubType.FOREST); assertType(ashaya, CardType.CREATURE, SubType.ELEMENTAL); assertAbility(playerA, ashaya, new GreenManaAbility(), true); @@ -57,8 +55,6 @@ public class AshayaSoulOfTheWildTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - // Ashaya loses all abilities and types and becomes a 3/3 Elk creature assertType(ashaya, CardType.LAND, false); assertNotSubtype(ashaya, SubType.ELEMENTAL); @@ -83,7 +79,6 @@ public class AshayaSoulOfTheWildTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, shapeshifter); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertType(ashaya, CardType.LAND, SubType.FOREST); assertType(ashaya, CardType.CREATURE, SubType.ELEMENTAL); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithAsThoughManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithAsThoughManaTest.java index 4330d9dd40..c36dd9af23 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithAsThoughManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithAsThoughManaTest.java @@ -34,7 +34,6 @@ public class CastSplitCardsWithAsThoughManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3); } @@ -67,7 +66,6 @@ public class CastSplitCardsWithAsThoughManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Bident of Thassa", 1); assertPermanentCount(playerB, "Bow of Nylea", 1); @@ -100,7 +98,6 @@ public class CastSplitCardsWithAsThoughManaTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Balduvian Bears", 1); assertPermanentCount(playerB, "Balduvian Bears", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithCostModificationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithCostModificationTest.java index 0e01666d15..f992a02890 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithCostModificationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithCostModificationTest.java @@ -42,7 +42,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Armed // Dangerous", 1); } @@ -67,7 +66,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Armed // Dangerous", 1); } @@ -94,7 +92,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Armed // Dangerous", 1); } @@ -121,7 +118,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Armed // Dangerous", 1); } @@ -153,7 +149,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Balduvian Bears", 1); } @@ -191,7 +186,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Armed // Dangerous", 1); } @@ -228,7 +222,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Armed // Dangerous", 1); } @@ -268,7 +261,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Armed // Dangerous", 1); } @@ -308,7 +300,6 @@ public class CastSplitCardsWithCostModificationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Armed // Dangerous", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithFlashbackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithFlashbackTest.java index 9c68cd0f05..f96c5f9160 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithFlashbackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithFlashbackTest.java @@ -31,7 +31,6 @@ public class CastSplitCardsWithFlashbackTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 - 3); assertExileCount(playerA, "Lightning Bolt", 1); @@ -63,7 +62,6 @@ public class CastSplitCardsWithFlashbackTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Bident of Thassa", 1); assertPermanentCount(playerB, "Bow of Nylea", 1); @@ -100,7 +98,6 @@ public class CastSplitCardsWithFlashbackTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Bident of Thassa", 1); assertGraveyardCount(playerB, "Bow of Nylea", 1); @@ -133,7 +130,6 @@ public class CastSplitCardsWithFlashbackTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Bident of Thassa", 1); assertPermanentCount(playerB, "Bow of Nylea", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithFuseTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithFuseTest.java index 1d1274381d..2cd3f8e79f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithFuseTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithFuseTest.java @@ -29,7 +29,6 @@ public class CastSplitCardsWithFuseTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Wear // Tear", 1); @@ -56,7 +55,6 @@ public class CastSplitCardsWithFuseTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Wear // Tear", 1); @@ -90,7 +88,6 @@ public class CastSplitCardsWithFuseTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Wear // Tear", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithSpliceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithSpliceTest.java index cfd0bdc08a..c03e736272 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithSpliceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/split/CastSplitCardsWithSpliceTest.java @@ -39,7 +39,6 @@ public class CastSplitCardsWithSpliceTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Wear // Tear", 1); assertGraveyardCount(playerB, "Bident of Thassa", 1); @@ -82,7 +81,6 @@ public class CastSplitCardsWithSpliceTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Wear // Tear", 1); assertGraveyardCount(playerB, "Bident of Thassa", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/targets/HexproofPlayerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/targets/HexproofPlayerTest.java index 9ea99bd22f..a4e77a5959 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/targets/HexproofPlayerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/targets/HexproofPlayerTest.java @@ -33,8 +33,7 @@ public class HexproofPlayerTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, 0); } @@ -52,8 +51,7 @@ public class HexproofPlayerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, 1); } @@ -74,8 +72,7 @@ public class HexproofPlayerTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, 1); // the Veil of Summer card only, no discarded card } @@ -95,8 +92,7 @@ public class HexproofPlayerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetMultiAmountTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetMultiAmountTest.java index e2661e4c35..95e5790868 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetMultiAmountTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetMultiAmountTest.java @@ -197,7 +197,6 @@ public class TargetMultiAmountTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -219,7 +218,6 @@ public class TargetMultiAmountTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -242,7 +240,6 @@ public class TargetMultiAmountTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -261,7 +258,6 @@ public class TargetMultiAmountTest extends CardTestPlayerBaseWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Kitesail Corsair", 5); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetRestrictionsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetRestrictionsTest.java index d530b6e796..7e9ef999bc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetRestrictionsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetRestrictionsTest.java @@ -32,9 +32,7 @@ public class TargetRestrictionsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - - assertAllCommandsUsed(); - + assertPermanentCount(playerA, "Dream Leash", 1); assertPermanentCount(playerA, "Sejiri Merfolk", 1); @@ -68,10 +66,8 @@ public class TargetRestrictionsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - - assertAllCommandsUsed(); - - + + assertGraveyardCount(playerA, "Take into Custody", 1); assertGraveyardCount(playerB, "Ornamental Courage", 1); assertPermanentCount(playerA, "Dream Leash", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java index df11bfb0f8..c526e68be3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java @@ -42,7 +42,6 @@ public class AbilityOwnershipTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); // Obelisk Spider Triggers 3x (Soul Snuffers puts 3 counters on 3 creatures) assertLife(playerA, 20 + 3); @@ -73,7 +72,6 @@ public class AbilityOwnershipTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DivineVisitationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DivineVisitationTest.java index 08cd6daa97..f2079e4e16 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DivineVisitationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DivineVisitationTest.java @@ -37,7 +37,6 @@ public class DivineVisitationTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertHandCount(playerB, 3); assertPermanentCount(playerA, "Treasure Token", 3); @@ -64,7 +63,6 @@ public class DivineVisitationTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, 1); assertPermanentCount(playerA, 5); @@ -89,7 +87,6 @@ public class DivineVisitationTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Human Token", 0); assertPermanentCount(playerA, "Angel Token", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java index 50e6f7579f..48236289a7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java @@ -28,7 +28,6 @@ public class EnterLeaveBattlefieldExileTargetTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Angel of Serenity", 1); assertExileCount("Silvercoat Lion", 1); @@ -101,7 +100,6 @@ public class EnterLeaveBattlefieldExileTargetTest extends CardTestPlayerBase { //setStrictChooseMode(true); // AI must target setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Knight Ally Token", 2); assertPermanentCount(playerA, "Angel of Serenity", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java index 81bcf10be1..e65d56ce6e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java @@ -404,7 +404,6 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Uro, Titan of Nature's Wrath", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GripOfChaosTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GripOfChaosTest.java index 88c048f6ab..ea9bcc96d9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GripOfChaosTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GripOfChaosTest.java @@ -68,7 +68,7 @@ public class GripOfChaosTest extends CardTestPlayerBase { // If both select the same permanent to exile, one spell fizzles so zcc == 7 otherwise 9 if (zcc != 7) { Assert.assertEquals("Sum of zone change counter should be 9", 9, zcc); - assertAllCommandsUsed(); // creates error if the random targets do select the same target twice zcc is 7 then the second trigger has an invalid target + // creates error if the random targets do select the same target twice zcc is 7 then the second trigger has an invalid target } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KardurDoomscourgeAndKithkinMourncallerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KardurDoomscourgeAndKithkinMourncallerTest.java index 206a3dea49..e4092b3bfe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KardurDoomscourgeAndKithkinMourncallerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KardurDoomscourgeAndKithkinMourncallerTest.java @@ -37,7 +37,6 @@ public class KardurDoomscourgeAndKithkinMourncallerTest extends CardTestPlayerBa setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Elvish Archers", 1); @@ -60,7 +59,6 @@ public class KardurDoomscourgeAndKithkinMourncallerTest extends CardTestPlayerBa setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Elvish Archers", 1); @@ -90,7 +88,6 @@ public class KardurDoomscourgeAndKithkinMourncallerTest extends CardTestPlayerBa setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Elvish Archers", 1); assertGraveyardCount(playerA, "Pearled Unicorn", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PollutedBondsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PollutedBondsTest.java index 216e4403a3..f00f6c657e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PollutedBondsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PollutedBondsTest.java @@ -16,7 +16,6 @@ public class PollutedBondsTest extends CardTestPlayerBase { playLand(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Forest"); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 22); assertLife(playerB, 18); } @@ -28,7 +27,6 @@ public class PollutedBondsTest extends CardTestPlayerBase { playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Forest"); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/RanarTheEverWatchfulTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/RanarTheEverWatchfulTest.java index 9df4137a6f..df71070887 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/RanarTheEverWatchfulTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/RanarTheEverWatchfulTest.java @@ -51,7 +51,6 @@ public class RanarTheEverWatchfulTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Boar Token", 3); // created token by Curse assertPermanentCount(playerA, "Spirit Token", 1); // created token by Ranar @@ -81,8 +80,7 @@ public class RanarTheEverWatchfulTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - + assertPermanentCount(playerA, "Spirit Token", 1); // created token by Ranar assertPermanentCount(playerB, "Spirit Token", 0); // no Spirit tokens for the other player } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java index f02692111e..83a8084c4d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java @@ -154,7 +154,6 @@ public class SpellCastTriggerTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Diamond Knight", 1); assertPowerToughness(playerA, "Diamond Knight", 3, 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java index b96914c82d..bcabc644d8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java @@ -28,7 +28,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Lightning Bolt", 1); assertPermanentCount(playerA, "Spellskite", 1); @@ -79,7 +78,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Spellskite", 1); assertPermanentCount(playerB, "Frost Titan", 1); @@ -119,7 +117,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Lightning Bolt", 1); @@ -161,7 +158,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Cryptic Command", 1); @@ -194,7 +190,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Lightning Bolt", 1); @@ -221,7 +216,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Flame Slash", 1); assertPowerToughness(playerB, "Spellskite", 3, 7); @@ -262,7 +256,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 + 5 - 2); assertGraveyardCount(playerB, 2); @@ -298,7 +291,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 + 5 - 2); assertGraveyardCount(playerB, 1); @@ -333,7 +325,6 @@ public class SpellskiteTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerB, 20 + 5 - 2); assertGraveyardCount(playerB, "Memnite", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StormCauldronTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StormCauldronTest.java index 2345625cd3..438540fb6f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StormCauldronTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StormCauldronTest.java @@ -20,7 +20,6 @@ public class StormCauldronTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerA, "Mountain", 1); assertPermanentCount(playerA, "Mountain", 0); @@ -57,7 +56,6 @@ public class StormCauldronTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Crystal Vein", 1); assertPermanentCount(playerA, "Mountain", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StrictProctorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StrictProctorTest.java index 1dede1407c..4910cd2044 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StrictProctorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StrictProctorTest.java @@ -33,8 +33,7 @@ public class StrictProctorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 23); // player gains the 3 life } @@ -56,8 +55,7 @@ public class StrictProctorTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 20); // player does not gain the 3 life } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WoodlandChampionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WoodlandChampionTest.java index 8058a2e856..ec1ad32bff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WoodlandChampionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WoodlandChampionTest.java @@ -31,6 +31,5 @@ public class WoodlandChampionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java index 462cd7ee4a..ded0288731 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java @@ -138,7 +138,6 @@ public class WorldgorgerDragonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 44); assertLife(playerB, 0); @@ -212,8 +211,6 @@ public class WorldgorgerDragonTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Volcanic Geyser", 1); assertGraveyardCount(playerA, "Worldgorger Dragon", 1); assertPermanentCount(playerA, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ZadaHedronGrinderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ZadaHedronGrinderTest.java index 73a8f8d72b..8ac2806361 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ZadaHedronGrinderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ZadaHedronGrinderTest.java @@ -65,7 +65,6 @@ public class ZadaHedronGrinderTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -97,7 +96,6 @@ public class ZadaHedronGrinderTest extends CardTestPlayerBase { //setStrictChooseMode(true); // no strict mode for AI setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SeraphAndSengirVampireTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SeraphAndSengirVampireTest.java index b87d2c2260..690a68f021 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SeraphAndSengirVampireTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SeraphAndSengirVampireTest.java @@ -29,8 +29,7 @@ public class SeraphAndSengirVampireTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - + assertGraveyardCount(playerA, "Seraph", 1); // Seraph dies assertGraveyardCount(playerB, "Sengir Vampire", 0); assertPermanentCount(playerA, "Sengir Vampire", 1); // playerA now controls the Sengir Vampire diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SyrCarahTheBoldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SyrCarahTheBoldTest.java index 9ee31b1654..5e1a8418da 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SyrCarahTheBoldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/damage/SyrCarahTheBoldTest.java @@ -48,7 +48,6 @@ public class SyrCarahTheBoldTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -81,6 +80,5 @@ public class SyrCarahTheBoldTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AshenRiderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AshenRiderTest.java index 9de90e04f4..f99e951431 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AshenRiderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AshenRiderTest.java @@ -55,8 +55,6 @@ public class AshenRiderTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPowerToughness(playerA, "Ashen Rider", 4,4); assertGraveyardCount(playerA, "Putrefy", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodArtistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodArtistTest.java index 976289bdf0..c235d17146 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodArtistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BloodArtistTest.java @@ -41,7 +41,6 @@ public class BloodArtistTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 23); assertLife(playerB, 17); @@ -68,7 +67,6 @@ public class BloodArtistTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Bone Splinters", 1); assertGraveyardCount(playerA, "Silvercoat Lion", 1); @@ -96,7 +94,6 @@ public class BloodArtistTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Bone Splinters", 1); assertGraveyardCount(playerA, "Blood Artist", 1); @@ -129,7 +126,6 @@ public class BloodArtistTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Bone Splinters", 1); assertGraveyardCount(playerA, "Terror", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java index c0e6c8b71e..7aca472cbc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java @@ -28,7 +28,6 @@ public class BrainMaggotTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Brain Maggot", 1); assertExileCount("Bloodflow Connoisseur", 1); @@ -59,7 +58,6 @@ public class BrainMaggotTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Brain Maggot", 1); assertGraveyardCount(playerB, "Lightning Bolt", 1); @@ -84,7 +82,6 @@ public class BrainMaggotTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.DECLARE_ATTACKERS); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Mesmeric Fiend", 1); assertGraveyardCount(playerB, "Lightning Bolt", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FootlightFiendTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FootlightFiendTest.java index 9865e2e739..70fff94d72 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FootlightFiendTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FootlightFiendTest.java @@ -28,6 +28,5 @@ public class FootlightFiendTest extends CardTestPlayerBase { assertLife(playerB, 20); assertGraveyardCount(playerA, "Footlight Fiend", 1); assertGraveyardCount(playerB, "Grizzly Bears", 1); - assertAllCommandsUsed(); } } \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/MurderousRiderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/MurderousRiderTest.java index 272f482f9c..d301e3e06c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/MurderousRiderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/MurderousRiderTest.java @@ -28,7 +28,6 @@ public class MurderousRiderTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Murderous Rider", 1); } @@ -48,7 +47,6 @@ public class MurderousRiderTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Murderous Rider", 0); assertGraveyardCount(playerA, "Murderous Rider", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/OmnathLocusOfRageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/OmnathLocusOfRageTest.java index e3d6882a22..2997367001 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/OmnathLocusOfRageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/OmnathLocusOfRageTest.java @@ -35,7 +35,6 @@ public class OmnathLocusOfRageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Diabolic Edict", 1); assertGraveyardCount(playerA, "Omnath, Locus of Rage", 1); @@ -64,7 +63,6 @@ public class OmnathLocusOfRageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Lightning Bolt", 1); assertGraveyardCount(playerB, "Blastfire Bolt", 1); @@ -92,7 +90,6 @@ public class OmnathLocusOfRageTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerB, "Silvercoat Lion", 1); assertGraveyardCount(playerB, "Doom Blade", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ShowstopperTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ShowstopperTest.java index 23e9e34c1e..c709bcfc9b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ShowstopperTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ShowstopperTest.java @@ -34,7 +34,6 @@ public class ShowstopperTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -73,7 +72,6 @@ public class ShowstopperTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); @@ -132,7 +130,6 @@ public class ShowstopperTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SilumgarScavengerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SilumgarScavengerTest.java index be864d83e0..13d33efbeb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SilumgarScavengerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SilumgarScavengerTest.java @@ -32,6 +32,5 @@ public class SilumgarScavengerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/TidehollowScullerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/TidehollowScullerTest.java index 44e239d997..651ef4c831 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/TidehollowScullerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/TidehollowScullerTest.java @@ -43,7 +43,6 @@ public class TidehollowScullerTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerB, "Bloodflow Connoisseur", 1); assertPermanentCount(playerA, "Tidehollow Sculler", 0); @@ -95,7 +94,6 @@ public class TidehollowScullerTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/WhisperwoodElementalTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/WhisperwoodElementalTest.java index dbd6e9cbec..0b6dcf9fae 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/WhisperwoodElementalTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/WhisperwoodElementalTest.java @@ -32,7 +32,6 @@ public class WhisperwoodElementalTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ZulaportCutthroatTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ZulaportCutthroatTest.java index 95b8d78f20..3fdd027a7f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ZulaportCutthroatTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ZulaportCutthroatTest.java @@ -54,7 +54,6 @@ public class ZulaportCutthroatTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 22); assertLife(playerB, 18); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java index 088403b0c7..29c51b29ff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java @@ -91,8 +91,7 @@ public class UnequipEventTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_COMBAT); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/HallOfTheBanditLordTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/HallOfTheBanditLordTest.java index d9b5f91882..70eba9adbb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/HallOfTheBanditLordTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/HallOfTheBanditLordTest.java @@ -32,7 +32,6 @@ public class HallOfTheBanditLordTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); this.assertAbility(playerA, "Goblin Roughrider", HasteAbility.getInstance(), true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/WatchersFromDelayedTriggeredAbilitiesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/WatchersFromDelayedTriggeredAbilitiesTest.java index e2b75f82f1..38807f092f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/WatchersFromDelayedTriggeredAbilitiesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/WatchersFromDelayedTriggeredAbilitiesTest.java @@ -36,7 +36,6 @@ public class WatchersFromDelayedTriggeredAbilitiesTest extends CardTestPlayerBas setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertHandCount(playerB, "Lightning Bolt", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/AttackPlaneswalkerTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/AttackPlaneswalkerTest.java index 6acbd1efd2..53d610d458 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/AttackPlaneswalkerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/AttackPlaneswalkerTest.java @@ -145,7 +145,6 @@ public class AttackPlaneswalkerTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(2, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/LifelinkInCombatTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/LifelinkInCombatTest.java index bd4a7bc4d8..2881b195b4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/LifelinkInCombatTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/LifelinkInCombatTest.java @@ -23,7 +23,6 @@ public class LifelinkInCombatTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Elderwood Scion", 5, 5); assertLife(playerA, 24); @@ -51,7 +50,6 @@ public class LifelinkInCombatTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Brion Stoutarm", 5, 5); assertLife(playerA, 24); @@ -78,7 +76,6 @@ public class LifelinkInCombatTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Elderwood Scion", 5, 5); assertLife(playerA, 24); @@ -100,7 +97,6 @@ public class LifelinkInCombatTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Ajani's Sunstriker", 2, 2); assertLife(playerA, 20); @@ -124,7 +120,6 @@ public class LifelinkInCombatTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Elderwood Scion", 5, 5); assertLife(playerA, 23); @@ -152,7 +147,6 @@ public class LifelinkInCombatTest extends CardTestPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Elderwood Scion", 5, 5); assertLife(playerA, 23); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBGPartnerCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBGPartnerCommanderTest.java index 62031d124e..c3c2e0a0b0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBGPartnerCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBGPartnerCommanderTest.java @@ -45,7 +45,6 @@ public class CastBGPartnerCommanderTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerB, "Titan's Presence", 1); assertCommandZoneCount(playerA, "Reyhan, Last of the Abzan", 1); @@ -79,8 +78,6 @@ public class CastBGPartnerCommanderTest extends CardTestCommanderDuelBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertCommandZoneCount(playerA, "Reyhan, Last of the Abzan", 0); assertCommandZoneCount(playerA, "Ikra Shidiqi, the Usurper", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java index e0dd95faf0..24d653bc89 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java @@ -42,7 +42,6 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Savage Summoning", 1); assertPermanentCount(playerA, "Prossh, Skyraider of Kher", 1); @@ -73,7 +72,6 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Karn Liberated", 0); assertPermanentCount(playerA, "Silvercoat Lion", 2); @@ -132,7 +130,6 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Karn Liberated", 0); assertPermanentCount(playerA, "Silvercoat Lion", 3); @@ -168,7 +165,6 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Mogg Infestation", 1); assertCommandZoneCount(playerB, "Daxos of Meletis", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java index 63afc2ea02..4dfdf6c2c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastCommanderTest.java @@ -49,7 +49,6 @@ public class CastCommanderTest extends CardTestCommanderDuelBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 40); assertLife(playerB, 40); @@ -85,7 +84,6 @@ public class CastCommanderTest extends CardTestCommanderDuelBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 40); assertLife(playerB, 40); @@ -117,8 +115,6 @@ public class CastCommanderTest extends CardTestCommanderDuelBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerA, "Ob Nixilis of the Black Oath", 0); assertLibraryCount(playerA, "Ob Nixilis of the Black Oath", 0); assertCommandZoneCount(playerA, "Ob Nixilis of the Black Oath", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java index c807c68454..44807463ad 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java @@ -36,7 +36,6 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -60,7 +59,6 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -84,7 +82,6 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -135,7 +132,6 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -160,7 +156,6 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Karn, Silver Golem", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderColorChangeTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderColorChangeTest.java index c4f23c1ebf..e0a47c1009 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderColorChangeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderColorChangeTest.java @@ -47,7 +47,6 @@ public class CommanderColorChangeTest extends CardTestCommanderDuelBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Norin the Wary", 1); @@ -106,8 +105,7 @@ public class CommanderColorChangeTest extends CardTestCommanderDuelBase { execute(); assertPermanentCount(playerA, "Norin the Wary", 1); - assertAllCommandsUsed(); - + Permanent norin = getPermanent("Norin the Wary", playerA); Assert.assertEquals(false, norin.getColor(currentGame).isBlue()); Assert.assertEquals(true, norin.getColor(currentGame).isRed()); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/MairsilThePretenderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/MairsilThePretenderTest.java index 060aaa2d60..4da75a4074 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/MairsilThePretenderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/MairsilThePretenderTest.java @@ -61,8 +61,7 @@ public class MairsilThePretenderTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 40); assertLife(playerB, 40); @@ -122,8 +121,7 @@ public class MairsilThePretenderTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 40); assertLife(playerB, 40); @@ -180,8 +178,7 @@ public class MairsilThePretenderTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - + assertLife(playerA, 40); assertLife(playerB, 40); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/MythUnboundTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/MythUnboundTest.java index 51d6aba932..4d61df976a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/MythUnboundTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/MythUnboundTest.java @@ -47,7 +47,6 @@ public class MythUnboundTest extends CardTestCommanderDuelBase { setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Myth Unbound", 1); assertGraveyardCount(playerB, "Lightning Bolt", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java index cc62b292f5..0aa1ba3fa2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java @@ -37,7 +37,6 @@ public class OpalPalaceTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertLife(playerA, 40); assertLife(playerB, 40); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/TeferiMageOfZhalfirTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/TeferiMageOfZhalfirTest.java index 717d8bc06d..5250942dbc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/TeferiMageOfZhalfirTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/TeferiMageOfZhalfirTest.java @@ -5,7 +5,6 @@ import mage.constants.PhaseStep; import mage.constants.Zone; import mage.game.Game; import mage.game.GameException; -import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestCommanderDuelBase; @@ -35,7 +34,6 @@ public class TeferiMageOfZhalfirTest extends CardTestCommanderDuelBase { execute(); assertPermanentCount(playerA, "Daxos of Meletis", 1); - assertAllCommandsUsed(); } @Test @@ -68,7 +66,6 @@ public class TeferiMageOfZhalfirTest extends CardTestCommanderDuelBase { setStrictChooseMode(true); setStopAt(9, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Daxos of Meletis", 1); assertPowerToughness(playerA, "Daxos of Meletis", 6, 6); // no effects removes after game over -- users and tests can get last game state with all affected effects diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java index 91388e0fa5..4d7bbfd553 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java @@ -34,7 +34,6 @@ public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelB setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -77,6 +76,5 @@ public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelB setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest1.java b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest1.java index a8b4a8e8e6..bfe8f62a4c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest1.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest1.java @@ -26,7 +26,6 @@ public class ThePrismaticPiperTest1 extends ThePrismaticPiperBaseTest { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertColor(playerA, piper, "U", true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest2.java b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest2.java index cdf672f916..8d10e22d6b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest2.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest2.java @@ -33,7 +33,6 @@ public class ThePrismaticPiperTest2 extends ThePrismaticPiperBaseTest { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertColor(playerA, piper, "R", true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest3.java b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest3.java index 57e79abc71..b1bc414b90 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest3.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest3.java @@ -29,7 +29,6 @@ public class ThePrismaticPiperTest3 extends ThePrismaticPiperBaseTest { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertColor(playerA, piper, "W", true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest5.java b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest5.java index 2a8c9172a0..1ddf5272b7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest5.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest5.java @@ -29,7 +29,6 @@ public class ThePrismaticPiperTest5 extends ThePrismaticPiperBaseTest { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertColor(playerA, piper, "W", true); } diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest8.java b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest8.java index 5b788024ac..afd9bb216f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest8.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/piper/ThePrismaticPiperTest8.java @@ -37,7 +37,6 @@ public class ThePrismaticPiperTest8 extends ThePrismaticPiperBaseTest { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertColor(playerA, piper, "G", true); assertHandCount(playerA, "Keruga, the Macrosage", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/game/ends/PhageTheUntouchableTest.java b/Mage.Tests/src/test/java/org/mage/test/game/ends/PhageTheUntouchableTest.java index 752843e46e..85863ecb09 100644 --- a/Mage.Tests/src/test/java/org/mage/test/game/ends/PhageTheUntouchableTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/game/ends/PhageTheUntouchableTest.java @@ -40,8 +40,6 @@ public class PhageTheUntouchableTest extends CardTestPlayerBase { execute(); - assertAllCommandsUsed(); - assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/AngelOfSerenityTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/AngelOfSerenityTest.java index d5836f8023..518d12e3d4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/AngelOfSerenityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/AngelOfSerenityTest.java @@ -59,7 +59,6 @@ public class AngelOfSerenityTest extends CardTestMultiPlayerBase { setStopAt(6, PhaseStep.UPKEEP); execute(); - assertAllCommandsUsed(); Assert.assertFalse("Player of Angel of Serenity did not leave the game", playerC.isInGame()); assertPermanentCount(playerA, 8); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/BlatantThieveryTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/BlatantThieveryTest.java index c0aeb9500b..2b1ea041c5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/BlatantThieveryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/BlatantThieveryTest.java @@ -48,7 +48,6 @@ public class BlatantThieveryTest extends CardTestMultiPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Blatant Thievery", 1); assertPermanentCount(playerA, "Silvercoat Lion", 1); @@ -81,7 +80,6 @@ public class BlatantThieveryTest extends CardTestMultiPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Blatant Thievery", 1); assertGraveyardCount(playerB, "Act of Aggression", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java index 90c4c0a5b3..116524c58b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java @@ -324,7 +324,6 @@ public class PlayerLeftGameRange1Test extends CardTestMultiPlayerBase { try { execute(); - assertAllCommandsUsed(); Assert.fail("must throw exception on execute"); } catch (Throwable e) { if (!e.getMessage().contains("Player PlayerD must have 0 actions but found 1")) { @@ -387,8 +386,6 @@ public class PlayerLeftGameRange1Test extends CardTestMultiPlayerBase { setStrictChooseMode(true); execute(); - assertAllCommandsUsed(); - assertLife(playerA, 2); Assert.assertFalse("Player D is no longer in the game", playerD.isInGame()); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java index 18edda5f01..8c25482301 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java @@ -458,8 +458,6 @@ public class PlayerLeftGameRangeAllTest extends CardTestMultiPlayerBase { execute(); - assertAllCommandsUsed(); - assertPermanentCount(playerD, "Silvercoat Lion", 1); assertGraveyardCount(playerC, "Lightning Bolt", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java index 03465c5589..8a5fb7651e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java @@ -2,7 +2,6 @@ package org.mage.test.multiplayer; import mage.constants.PhaseStep; import mage.constants.Zone; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestCommander4PlayersWithAIHelps; @@ -62,7 +61,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 6, 6); assertPermanentCount(playerA, "Soldier Token", 0); @@ -79,7 +77,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 2, 2); assertPermanentCount(playerA, "Soldier Token", 4); @@ -96,7 +93,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 4, 4); assertPermanentCount(playerA, "Soldier Token", 2); @@ -118,7 +114,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, tyrant, 1); assertLife(playerA, 20); @@ -152,7 +147,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, tyrant, 1); assertLife(playerA, 20); @@ -174,7 +168,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 5, 5); assertPermanentCount(playerA, "Soldier Token", 2); @@ -194,7 +187,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 4, 4); assertPermanentCount(playerA, "Soldier Token", 3); @@ -213,7 +205,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 6, 6); assertPermanentCount(playerA, "Soldier Token", 0); @@ -233,7 +224,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 7, 7); assertPermanentCount(playerA, "Soldier Token", 0); @@ -255,7 +245,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 6, 6); assertPermanentCount(playerA, "Soldier Token", 0); @@ -275,7 +264,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 4, 4); assertPermanentCount(playerA, "Soldier Token", 3); @@ -301,7 +289,6 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 6, 6); assertPermanentCount(playerA, "Soldier Token", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/CopyAnthemEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/CopyAnthemEffectTest.java index 64edc0010c..cd7ae006bc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/CopyAnthemEffectTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/CopyAnthemEffectTest.java @@ -30,7 +30,6 @@ public class CopyAnthemEffectTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); assertPowerToughness(playerA, "Runeclaw Bear", 4, 4); } diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicCollusionTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicCollusionTest.java index 3a1c1b9414..db36b35500 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicCollusionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicCollusionTest.java @@ -40,7 +40,6 @@ public class DemonicCollusionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -73,6 +72,5 @@ public class DemonicCollusionTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(5, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicPactTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicPactTest.java index e0e5cbc3f1..10375d55c0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicPactTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/DemonicPactTest.java @@ -113,8 +113,6 @@ public class DemonicPactTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); - assertGraveyardCount(playerA, "Silvercoat Lion", 1); assertGraveyardCount(playerB, "Pact of Negation", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java index 56c6f72c56..c7c87b75c5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java @@ -75,8 +75,6 @@ public class StateValuesTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); - assertLife(playerA, 20); assertLife(playerB, 20); @@ -104,7 +102,6 @@ public class StateValuesTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertAllCommandsUsed(); // Before rollback assertTappedCount("Plains", true, 4); @@ -138,7 +135,6 @@ public class StateValuesTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // Before rollback assertTappedCount("Plains", true, 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/CardIconsTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/CardIconsTest.java index e41a5920fc..0d0937c71b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/CardIconsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/CardIconsTest.java @@ -62,7 +62,6 @@ public class CardIconsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -151,7 +150,6 @@ public class CardIconsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -220,7 +218,6 @@ public class CardIconsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -279,6 +276,5 @@ public class CardIconsTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } 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 626a36f184..44490f6eb4 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 @@ -1497,7 +1497,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement * * @throws AssertionError */ - public void assertAllCommandsUsed() throws AssertionError { + private void assertAllCommandsUsed() throws AssertionError { for (Player player : currentGame.getPlayers().values()) { TestPlayer testPlayer = (TestPlayer) player; assertActionsMustBeEmpty(testPlayer); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java index 5ba841acf1..50f832f6c3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/cards/abilities/ProtectionFromTypeTest.java @@ -56,7 +56,6 @@ public class ProtectionFromTypeTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}, Remove a charge counter from {this}, {T}: Put a -1/-1 counter on target creature.", "Coral Merfolk"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertAllCommandsUsed(); // Coral Merfolk should be destroyed assertPermanentCount(playerB, "Coral Merfolk", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/testapi/TestAliases.java b/Mage.Tests/src/test/java/org/mage/test/testapi/TestAliases.java index eb9403b086..52c0fe80c3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/testapi/TestAliases.java +++ b/Mage.Tests/src/test/java/org/mage/test/testapi/TestAliases.java @@ -91,7 +91,6 @@ public class TestAliases extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -125,7 +124,6 @@ public class TestAliases extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -146,7 +144,6 @@ public class TestAliases extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Lightning Bolt", 3); assertGraveyardCount(playerA, "Silvercoat Lion", 3); @@ -162,7 +159,6 @@ public class TestAliases extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Silvercoat Lion", 1); @@ -178,7 +174,6 @@ public class TestAliases extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertGraveyardCount(playerA, "@bolt", 1); assertGraveyardCount(playerA, "@lion", 1); @@ -196,7 +191,6 @@ public class TestAliases extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Embermage Goblin", 2); assertGraveyardCount(playerA, "Silvercoat Lion", 1); @@ -216,7 +210,6 @@ public class TestAliases extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "@goblin.1", 1); assertPermanentCount(playerA, "@goblin.2", 1); @@ -239,7 +232,6 @@ public class TestAliases extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertTapped("@mana.1", false); assertTapped("@mana.2", true); diff --git a/Mage.Tests/src/test/java/org/mage/test/testapi/WaitStackResolvedTest.java b/Mage.Tests/src/test/java/org/mage/test/testapi/WaitStackResolvedTest.java index 75effe8401..474f0100f8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/testapi/WaitStackResolvedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/testapi/WaitStackResolvedTest.java @@ -47,7 +47,6 @@ public class WaitStackResolvedTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } @Test @@ -95,6 +94,5 @@ public class WaitStackResolvedTest extends CardTestPlayerBase { setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java b/Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java index 201637d8c9..5d396477e5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java @@ -133,8 +133,6 @@ public class ExtraTurnsTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.PRECOMBAT_MAIN); execute(); - assertAllCommandsUsed(); - assertExileCount(playerB, "Temporal Mastery", 1); Assert.assertTrue("Turn 4 is an extra turn ", currentGame.getState().isExtraTurn());