diff --git a/worlds/jakanddaxter/test/__init__.py b/worlds/jakanddaxter/test/__init__.py index a1d7bfb390..7c666a97b4 100644 --- a/worlds/jakanddaxter/test/__init__.py +++ b/worlds/jakanddaxter/test/__init__.py @@ -1,4 +1,4 @@ -from .. import JakAndDaxterWorld +from worlds.jakanddaxter import JakAndDaxterWorld from ..GameID import jak1_name from test.bases import WorldTestBase diff --git a/worlds/jakanddaxter/test/test_locations.py b/worlds/jakanddaxter/test/test_locations.py index 1a8f754b56..46c5aa5887 100644 --- a/worlds/jakanddaxter/test/test_locations.py +++ b/worlds/jakanddaxter/test/test_locations.py @@ -1,7 +1,7 @@ import typing -from . import JakAndDaxterTestBase -from .. import jak1_id +from ..test import JakAndDaxterTestBase +from ..GameID import jak1_id from ..regs.RegionBase import JakAndDaxterRegion from ..locs import (ScoutLocations as Scouts, SpecialLocations as Specials) diff --git a/worlds/jakanddaxter/test/test_moverando.py b/worlds/jakanddaxter/test/test_moverando.py index dddc9f4201..b0dcd13636 100644 --- a/worlds/jakanddaxter/test/test_moverando.py +++ b/worlds/jakanddaxter/test/test_moverando.py @@ -1,10 +1,5 @@ -import typing - -from BaseClasses import CollectionState -from . import JakAndDaxterTestBase -from ..GameID import jak1_id +from ..test import JakAndDaxterTestBase from ..Items import move_item_table -from ..regs.RegionBase import JakAndDaxterRegion class MoveRandoTest(JakAndDaxterTestBase): diff --git a/worlds/jakanddaxter/test/test_orbsanity.py b/worlds/jakanddaxter/test/test_orbsanity.py index 4f84256be1..2883570f8e 100644 --- a/worlds/jakanddaxter/test/test_orbsanity.py +++ b/worlds/jakanddaxter/test/test_orbsanity.py @@ -1,4 +1,4 @@ -from . import JakAndDaxterTestBase +from ..test import JakAndDaxterTestBase from ..Items import orb_item_table diff --git a/worlds/jakanddaxter/test/test_orderedcellcounts.py b/worlds/jakanddaxter/test/test_orderedcellcounts.py index a457beaa4a..b8cc7eac55 100644 --- a/worlds/jakanddaxter/test/test_orderedcellcounts.py +++ b/worlds/jakanddaxter/test/test_orderedcellcounts.py @@ -1,10 +1,4 @@ -import typing - -from BaseClasses import CollectionState -from . import JakAndDaxterTestBase -from ..GameID import jak1_id -from ..Items import move_item_table -from ..regs.RegionBase import JakAndDaxterRegion +from ..test import JakAndDaxterTestBase class ReorderedCellCountsTest(JakAndDaxterTestBase): diff --git a/worlds/jakanddaxter/test/test_trades.py b/worlds/jakanddaxter/test/test_trades.py index 4a9331307f..6468f347b0 100644 --- a/worlds/jakanddaxter/test/test_trades.py +++ b/worlds/jakanddaxter/test/test_trades.py @@ -1,10 +1,4 @@ -import typing - -from BaseClasses import CollectionState -from . import JakAndDaxterTestBase -from ..GameID import jak1_id -from ..Items import move_item_table -from ..regs.RegionBase import JakAndDaxterRegion +from ..test import JakAndDaxterTestBase class TradesCostNothingTest(JakAndDaxterTestBase):