Stardew Valley: Cut tests by 3 minutes (#2375)

* Stardew Valley: Test: unify mods

* Stardew Valley: Test: don't use SVTestBase where setUp is unused

* Stardew Valley: Test: remove duplicate backpack test

* Stardew Valley: Test: remove 2,3,4 heart tests

assume the math is correct with just 2 points on the curve

* Stardew Valley: Test: reduce duplicate test/gen runs

* Stardew Valley: Test: Change 'long' tests to not use TestBase

TestBase' setUp is not being used in the changed TestCases

* Stardew Valley: Test: Use subtests and inheritance for backpacks

* Stardew Valley: Test: add flag to skip some of the extensive tests by default

worlds/stardew_valley/test/__init__.py

@@ -1,8 +1,10 @@
 import os
+import unittest
 from argparse import Namespace
 from typing import Dict, FrozenSet, Tuple, Any, ClassVar
 
 from BaseClasses import MultiWorld
+from Utils import cache_argsless
 from test.TestBase import WorldTestBase
 from test.general import gen_steps, setup_solo_multiworld as setup_base_solo_multiworld
 from .. import StardewValleyWorld
@@ -13,11 +15,17 @@ from ..options import Cropsanity, SkillProgression, SpecialOrderLocations, Frien
     BundleRandomization, BundlePrice, FestivalLocations, FriendsanityHeartSize, ExcludeGingerIsland, TrapItems, Goal, Mods
 
 
-class SVTestBase(WorldTestBase):
+class SVTestCase(unittest.TestCase):
+    player: ClassVar[int] = 1
+    """Set to False to not skip some 'extra' tests"""
+    skip_extra_tests: bool = True
+    """Set to False to run tests that take long"""
+    skip_long_tests: bool = True
+
+
+class SVTestBase(WorldTestBase, SVTestCase):
     game = "Stardew Valley"
     world: StardewValleyWorld
-    player: ClassVar[int] = 1
-    skip_long_tests: bool = True
 
     def world_setup(self, *args, **kwargs):
         super().world_setup(*args, **kwargs)
@@ -34,66 +42,73 @@ class SVTestBase(WorldTestBase):
         should_run_default_tests = is_not_stardew_test and super().run_default_tests
         return should_run_default_tests
 
-    def minimal_locations_maximal_items(self):
-        min_max_options = {
-            SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
-            Cropsanity.internal_name: Cropsanity.option_shuffled,
-            BackpackProgression.internal_name: BackpackProgression.option_vanilla,
-            ToolProgression.internal_name: ToolProgression.option_vanilla,
-            SkillProgression.internal_name: SkillProgression.option_vanilla,
-            BuildingProgression.internal_name: BuildingProgression.option_vanilla,
-            ElevatorProgression.internal_name: ElevatorProgression.option_vanilla,
-            ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled,
-            SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled,
-            HelpWantedLocations.internal_name: 0,
-            Fishsanity.internal_name: Fishsanity.option_none,
-            Museumsanity.internal_name: Museumsanity.option_none,
-            Friendsanity.internal_name: Friendsanity.option_none,
-            NumberOfMovementBuffs.internal_name: 12,
-            NumberOfLuckBuffs.internal_name: 12,
-        }
-        return min_max_options
 
-    def allsanity_options_without_mods(self):
-        allsanity = {
-            Goal.internal_name: Goal.option_perfection,
-            BundleRandomization.internal_name: BundleRandomization.option_shuffled,
-            BundlePrice.internal_name: BundlePrice.option_expensive,
-            SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
-            Cropsanity.internal_name: Cropsanity.option_shuffled,
-            BackpackProgression.internal_name: BackpackProgression.option_progressive,
-            ToolProgression.internal_name: ToolProgression.option_progressive,
-            SkillProgression.internal_name: SkillProgression.option_progressive,
-            BuildingProgression.internal_name: BuildingProgression.option_progressive,
-            FestivalLocations.internal_name: FestivalLocations.option_hard,
-            ElevatorProgression.internal_name: ElevatorProgression.option_progressive,
-            ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_full_shuffling,
-            SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
-            HelpWantedLocations.internal_name: 56,
-            Fishsanity.internal_name: Fishsanity.option_all,
-            Museumsanity.internal_name: Museumsanity.option_all,
-            Friendsanity.internal_name: Friendsanity.option_all_with_marriage,
-            FriendsanityHeartSize.internal_name: 1,
-            NumberOfMovementBuffs.internal_name: 12,
-            NumberOfLuckBuffs.internal_name: 12,
-            ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
-            TrapItems.internal_name: TrapItems.option_nightmare,
-        }
-        return allsanity
+@cache_argsless
+def minimal_locations_maximal_items():
+    min_max_options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Cropsanity.internal_name: Cropsanity.option_shuffled,
+        BackpackProgression.internal_name: BackpackProgression.option_vanilla,
+        ToolProgression.internal_name: ToolProgression.option_vanilla,
+        SkillProgression.internal_name: SkillProgression.option_vanilla,
+        BuildingProgression.internal_name: BuildingProgression.option_vanilla,
+        ElevatorProgression.internal_name: ElevatorProgression.option_vanilla,
+        ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled,
+        SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled,
+        HelpWantedLocations.internal_name: 0,
+        Fishsanity.internal_name: Fishsanity.option_none,
+        Museumsanity.internal_name: Museumsanity.option_none,
+        Friendsanity.internal_name: Friendsanity.option_none,
+        NumberOfMovementBuffs.internal_name: 12,
+        NumberOfLuckBuffs.internal_name: 12,
+    }
+    return min_max_options
+
+
+@cache_argsless
+def allsanity_options_without_mods():
+    allsanity = {
+        Goal.internal_name: Goal.option_perfection,
+        BundleRandomization.internal_name: BundleRandomization.option_shuffled,
+        BundlePrice.internal_name: BundlePrice.option_expensive,
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Cropsanity.internal_name: Cropsanity.option_shuffled,
+        BackpackProgression.internal_name: BackpackProgression.option_progressive,
+        ToolProgression.internal_name: ToolProgression.option_progressive,
+        SkillProgression.internal_name: SkillProgression.option_progressive,
+        BuildingProgression.internal_name: BuildingProgression.option_progressive,
+        FestivalLocations.internal_name: FestivalLocations.option_hard,
+        ElevatorProgression.internal_name: ElevatorProgression.option_progressive,
+        ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_full_shuffling,
+        SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
+        HelpWantedLocations.internal_name: 56,
+        Fishsanity.internal_name: Fishsanity.option_all,
+        Museumsanity.internal_name: Museumsanity.option_all,
+        Friendsanity.internal_name: Friendsanity.option_all_with_marriage,
+        FriendsanityHeartSize.internal_name: 1,
+        NumberOfMovementBuffs.internal_name: 12,
+        NumberOfLuckBuffs.internal_name: 12,
+        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
+        TrapItems.internal_name: TrapItems.option_nightmare,
+    }
+    return allsanity
+
+
+@cache_argsless
+def allsanity_options_with_mods():
+    allsanity = {}
+    allsanity.update(allsanity_options_without_mods())
+    all_mods = (
+        ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,
+        ModNames.luck_skill, ModNames.magic, ModNames.socializing_skill, ModNames.archaeology,
+        ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna,
+        ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene,
+        ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores,
+        ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator
+    )
+    allsanity.update({Mods.internal_name: all_mods})
+    return allsanity
 
-    def allsanity_options_with_mods(self):
-        allsanity = {}
-        allsanity.update(self.allsanity_options_without_mods())
-        all_mods = (
-            ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,
-            ModNames.luck_skill, ModNames.magic, ModNames.socializing_skill, ModNames.archaeology,
-            ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna,
-            ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene,
-            ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores,
-            ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator
-        )
-        allsanity.update({Mods.internal_name: all_mods})
-        return allsanity
 
 pre_generated_worlds = {}