From 48fe414cda110189e0adaf335b241c772fff44c5 Mon Sep 17 00:00:00 2001 From: massimilianodelliubaldini <8584296+massimilianodelliubaldini@users.noreply.github.com> Date: Tue, 13 May 2025 21:51:57 -0400 Subject: [PATCH] Move tests out of init, add colon to game name (now that it's safe). --- worlds/jakanddaxter/GameID.py | 2 +- worlds/jakanddaxter/test/__init__.py | 107 ------------------ worlds/jakanddaxter/test/bases.py | 107 ++++++++++++++++++ worlds/jakanddaxter/test/test_locations.py | 2 +- worlds/jakanddaxter/test/test_moverando.py | 2 +- worlds/jakanddaxter/test/test_orbsanity.py | 2 +- .../test/test_orderedcellcounts.py | 2 +- worlds/jakanddaxter/test/test_trades.py | 2 +- worlds/jakanddaxter/test/test_traps.py | 2 +- 9 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 worlds/jakanddaxter/test/bases.py diff --git a/worlds/jakanddaxter/GameID.py b/worlds/jakanddaxter/GameID.py index 85dd32a213..d596a6cc82 100644 --- a/worlds/jakanddaxter/GameID.py +++ b/worlds/jakanddaxter/GameID.py @@ -5,4 +5,4 @@ jak1_id = 741000000 jak1_max = jak1_id + 999999 # The name of the game. -jak1_name = "Jak and Daxter The Precursor Legacy" +jak1_name = "Jak and Daxter: The Precursor Legacy" diff --git a/worlds/jakanddaxter/test/__init__.py b/worlds/jakanddaxter/test/__init__.py index 12f6aa377d..e69de29bb2 100644 --- a/worlds/jakanddaxter/test/__init__.py +++ b/worlds/jakanddaxter/test/__init__.py @@ -1,107 +0,0 @@ -from worlds.jakanddaxter import JakAndDaxterWorld -from ..GameID import jak1_name -from test.bases import WorldTestBase - - -class JakAndDaxterTestBase(WorldTestBase): - game = jak1_name - world: JakAndDaxterWorld - - level_info = { - "Geyser Rock": { - "cells": 4, - "flies": 7, - "orbs": 50, - "caches": 0, - }, - "Sandover Village": { - "cells": 6, - "flies": 7, - "orbs": 50, - "caches": 1, - }, - "Forbidden Jungle": { - "cells": 8, - "flies": 7, - "orbs": 150, - "caches": 1, - }, - "Sentinel Beach": { - "cells": 8, - "flies": 7, - "orbs": 150, - "caches": 2, - }, - "Misty Island": { - "cells": 8, - "flies": 7, - "orbs": 150, - "caches": 1, - }, - "Fire Canyon": { - "cells": 2, - "flies": 7, - "orbs": 50, - "caches": 0, - }, - "Rock Village": { - "cells": 6, - "flies": 7, - "orbs": 50, - "caches": 1, - }, - "Precursor Basin": { - "cells": 8, - "flies": 7, - "orbs": 200, - "caches": 0, - }, - "Lost Precursor City": { - "cells": 8, - "flies": 7, - "orbs": 200, - "caches": 2, - }, - "Boggy Swamp": { - "cells": 8, - "flies": 7, - "orbs": 200, - "caches": 0, - }, - "Mountain Pass": { - "cells": 4, - "flies": 7, - "orbs": 50, - "caches": 0, - }, - "Volcanic Crater": { - "cells": 8, - "flies": 7, - "orbs": 50, - "caches": 0, - }, - "Spider Cave": { - "cells": 8, - "flies": 7, - "orbs": 200, - "caches": 0, - }, - "Snowy Mountain": { - "cells": 8, - "flies": 7, - "orbs": 200, - "caches": 3, - }, - "Lava Tube": { - "cells": 2, - "flies": 7, - "orbs": 50, - "caches": 0, - }, - "Gol and Maia's Citadel": { - "cells": 5, - "flies": 7, - "orbs": 200, - "caches": 3, - }, - } diff --git a/worlds/jakanddaxter/test/bases.py b/worlds/jakanddaxter/test/bases.py new file mode 100644 index 0000000000..12f6aa377d --- /dev/null +++ b/worlds/jakanddaxter/test/bases.py @@ -0,0 +1,107 @@ +from worlds.jakanddaxter import JakAndDaxterWorld +from ..GameID import jak1_name +from test.bases import WorldTestBase + + +class JakAndDaxterTestBase(WorldTestBase): + game = jak1_name + world: JakAndDaxterWorld + + level_info = { + "Geyser Rock": { + "cells": 4, + "flies": 7, + "orbs": 50, + "caches": 0, + }, + "Sandover Village": { + "cells": 6, + "flies": 7, + "orbs": 50, + "caches": 1, + }, + "Forbidden Jungle": { + "cells": 8, + "flies": 7, + "orbs": 150, + "caches": 1, + }, + "Sentinel Beach": { + "cells": 8, + "flies": 7, + "orbs": 150, + "caches": 2, + }, + "Misty Island": { + "cells": 8, + "flies": 7, + "orbs": 150, + "caches": 1, + }, + "Fire Canyon": { + "cells": 2, + "flies": 7, + "orbs": 50, + "caches": 0, + }, + "Rock Village": { + "cells": 6, + "flies": 7, + "orbs": 50, + "caches": 1, + }, + "Precursor Basin": { + "cells": 8, + "flies": 7, + "orbs": 200, + "caches": 0, + }, + "Lost Precursor City": { + "cells": 8, + "flies": 7, + "orbs": 200, + "caches": 2, + }, + "Boggy Swamp": { + "cells": 8, + "flies": 7, + "orbs": 200, + "caches": 0, + }, + "Mountain Pass": { + "cells": 4, + "flies": 7, + "orbs": 50, + "caches": 0, + }, + "Volcanic Crater": { + "cells": 8, + "flies": 7, + "orbs": 50, + "caches": 0, + }, + "Spider Cave": { + "cells": 8, + "flies": 7, + "orbs": 200, + "caches": 0, + }, + "Snowy Mountain": { + "cells": 8, + "flies": 7, + "orbs": 200, + "caches": 3, + }, + "Lava Tube": { + "cells": 2, + "flies": 7, + "orbs": 50, + "caches": 0, + }, + "Gol and Maia's Citadel": { + "cells": 5, + "flies": 7, + "orbs": 200, + "caches": 3, + }, + } diff --git a/worlds/jakanddaxter/test/test_locations.py b/worlds/jakanddaxter/test/test_locations.py index 7f69fcf005..523f792ef0 100644 --- a/worlds/jakanddaxter/test/test_locations.py +++ b/worlds/jakanddaxter/test/test_locations.py @@ -1,6 +1,6 @@ import typing -from ..test import JakAndDaxterTestBase +from .bases import JakAndDaxterTestBase from ..GameID import jak1_id from ..regs.RegionBase import JakAndDaxterRegion from ..locs import (ScoutLocations as Scouts, diff --git a/worlds/jakanddaxter/test/test_moverando.py b/worlds/jakanddaxter/test/test_moverando.py index 4e9dcf8847..c74b06ac53 100644 --- a/worlds/jakanddaxter/test/test_moverando.py +++ b/worlds/jakanddaxter/test/test_moverando.py @@ -1,4 +1,4 @@ -from ..test import JakAndDaxterTestBase +from .bases import JakAndDaxterTestBase from ..Items import move_item_table diff --git a/worlds/jakanddaxter/test/test_orbsanity.py b/worlds/jakanddaxter/test/test_orbsanity.py index 2883570f8e..ef15889695 100644 --- a/worlds/jakanddaxter/test/test_orbsanity.py +++ b/worlds/jakanddaxter/test/test_orbsanity.py @@ -1,4 +1,4 @@ -from ..test import JakAndDaxterTestBase +from .bases 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 b8cc7eac55..7ad0d76ca5 100644 --- a/worlds/jakanddaxter/test/test_orderedcellcounts.py +++ b/worlds/jakanddaxter/test/test_orderedcellcounts.py @@ -1,4 +1,4 @@ -from ..test import JakAndDaxterTestBase +from .bases import JakAndDaxterTestBase class ReorderedCellCountsTest(JakAndDaxterTestBase): diff --git a/worlds/jakanddaxter/test/test_trades.py b/worlds/jakanddaxter/test/test_trades.py index 0e5b25ebb8..3fe1c489e6 100644 --- a/worlds/jakanddaxter/test/test_trades.py +++ b/worlds/jakanddaxter/test/test_trades.py @@ -1,4 +1,4 @@ -from ..test import JakAndDaxterTestBase +from .bases import JakAndDaxterTestBase class TradesCostNothingTest(JakAndDaxterTestBase): diff --git a/worlds/jakanddaxter/test/test_traps.py b/worlds/jakanddaxter/test/test_traps.py index 5087abadd8..841997798b 100644 --- a/worlds/jakanddaxter/test/test_traps.py +++ b/worlds/jakanddaxter/test/test_traps.py @@ -1,5 +1,5 @@ from BaseClasses import ItemClassification -from ..test import JakAndDaxterTestBase +from .bases import JakAndDaxterTestBase class NoTrapsTest(JakAndDaxterTestBase):