From 32ba438eddbb05dfab1ffdb36992907049ec13b6 Mon Sep 17 00:00:00 2001 From: Valentin BOUVAREL Date: Thu, 17 Nov 2022 11:07:57 +0100 Subject: [PATCH] Add cleaner const naming --- gestform.py | 8 +++++--- tests/tests_gestform.py | 14 +++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gestform.py b/gestform.py index 6a3ad22..b9365a0 100644 --- a/gestform.py +++ b/gestform.py @@ -7,6 +7,8 @@ from random import shuffle MIN = -1000 MAX = 1000 +GESTE = 3 +FORME = 5 def generate_numbers_list(mini: int, maxi: int) -> List[int]: @@ -22,11 +24,11 @@ def randomise_with_iterator(list_from: List[int]) -> int: def gestformation(number: int) -> str: """Transform a number to a string depends on modularity""" - if number % 3 == 0 and number % 5 == 0: + if number % GESTE == 0 and number % FORME == 0: return "GestForm" - elif number % 5 == 0: + elif number % FORME == 0: return "Forme" - elif number % 3 == 0: + elif number % GESTE == 0: return "Geste" return number diff --git a/tests/tests_gestform.py b/tests/tests_gestform.py index 0562efd..0af8f29 100644 --- a/tests/tests_gestform.py +++ b/tests/tests_gestform.py @@ -3,7 +3,7 @@ from unittest import TestCase from gestform import ( generate_numbers_list, MIN, MAX, randomise_with_iterator, - gestformation, + gestformation ) @@ -38,42 +38,42 @@ class GestFormTest(TestCase): ) ] - def test_geste_modulo_3(self): + def test_geste_modulo(self): gest_numbers = [-999, -333, 3, 9, 18, 1002] for i in gest_numbers: with self.subTest(i): result = gestformation(i) self.assertEqual(result, "Geste") - def test_not_geste_modulo_3(self): + def test_not_geste_modulo(self): gest_numbers = [-998, -332, 2, 10, 19, 1000] for i in gest_numbers: with self.subTest(i): result = gestformation(i) self.assertNotEqual(result, "Geste") - def test_forme_modulo_5(self): + def test_forme_modulo(self): gest_numbers = [-5555, -50, 5, 40, 70, 995] for i in gest_numbers: with self.subTest(i): result = gestformation(i) self.assertEqual(result, "Forme") - def test_not_forme_modulo_5(self): + def test_not_forme_modulo(self): gest_numbers = [-998, -332, 2, 14, 19, 1111] for i in gest_numbers: with self.subTest(i): result = gestformation(i) self.assertNotEqual(result, "Forme") - def test_gestform_modulo_15(self): + def test_gestform_modulo(self): gest_numbers = [-1500, -60, 15, 105, 900, 1005] for i in gest_numbers: with self.subTest(i): result = gestformation(i) self.assertEqual(result, "GestForm") - def test_not_gestform_modulo_5(self): + def test_not_gestform_modulo(self): gest_numbers = [-998, -332, 2, 10, 19, 1000] for i in gest_numbers: with self.subTest(i):