From 954a86463d1756a443016f616e2e828eef3279df Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Fri, 22 Mar 2024 15:18:41 +0100 Subject: [PATCH] Fix tests --- jarvis/objective/urls.py | 2 +- jarvis/tools/models.py | 5 +++++ jarvis/tools/tests_models.py | 12 ++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/jarvis/objective/urls.py b/jarvis/objective/urls.py index 25bb5e1..017135f 100644 --- a/jarvis/objective/urls.py +++ b/jarvis/objective/urls.py @@ -37,7 +37,7 @@ urlpatterns = [ # COMBINATION # path( - r"combination/lookup/", + r"combination/lookup/", # views.combination_lookup, name="combination_lookup", ), diff --git a/jarvis/tools/models.py b/jarvis/tools/models.py index 11e2c9e..26d1d5d 100644 --- a/jarvis/tools/models.py +++ b/jarvis/tools/models.py @@ -61,10 +61,15 @@ class Season: if not re.search(pattern, self.label): return False + print() + print() first_year = int(self.label[:dash_position]) + print(first_year) second_year = int(self.label[dash_position + 1 :]) + print(second_year) if first_year != second_year - 1: + print("Not valid") return False return True diff --git a/jarvis/tools/tests_models.py b/jarvis/tools/tests_models.py index 26a6f2e..a0f21eb 100644 --- a/jarvis/tools/tests_models.py +++ b/jarvis/tools/tests_models.py @@ -12,27 +12,27 @@ class ModelTestCase(TestCase): season = Season("2022-2024") self.assertEqual(season.is_valid(), True) - self.assertEqual(season.label, "2022-2023") + self.assertEqual(season.label, "2023-2024") season = Season("2024-2023") self.assertEqual(season.is_valid(), True) - self.assertEqual(season.label, "2022-2023") + self.assertEqual(season.label, "2023-2024") season = Season("1358-5682") self.assertEqual(season.is_valid(), True) - self.assertEqual(season.label, "2022-2023") + self.assertEqual(season.label, "2023-2024") season = Season("fgkrs-gkml") self.assertEqual(season.is_valid(), True) - self.assertEqual(season.label, "2022-2023") + self.assertEqual(season.label, "2023-2024") season = Season("drgnldsjgklfdtngl") self.assertEqual(season.is_valid(), True) - self.assertEqual(season.label, "2022-2023") + self.assertEqual(season.label, "2023-2024") season = Season("12675353878354") self.assertEqual(season.is_valid(), True) - self.assertEqual(season.label, "2022-2023") + self.assertEqual(season.label, "2023-2024") def test_season_is_valid(self): season = Season("2022-2023")