aboutsummaryrefslogtreecommitdiff
path: root/tests.py
diff options
context:
space:
mode:
authorAlban Gruin2019-08-30 13:59:13 +0200
committerAlban Gruin2019-09-01 13:28:32 +0200
commit683409424325e7048c802960e81585320904fac1 (patch)
treee752d9d9d4d24a45653af0bdd413f72618734d2b /tests.py
parent0ad58a9268130e49c017f13beacb618f466a722f (diff)
parenta85f2fb91d1a4a0e31c41c392e404d7ddbf21109 (diff)
Merge branch 'ag/parser-ups-2019' into futur
Diffstat (limited to 'tests.py')
-rw-r--r--tests.py34
1 files changed, 25 insertions, 9 deletions
diff --git a/tests.py b/tests.py
index b411db3..1e80b48 100644
--- a/tests.py
+++ b/tests.py
@@ -341,6 +341,16 @@ class RoomTestCase(TestCase):
for i in range(5, 7)
]
+ # On n’insère pas ces salles dans la base de données, elles ne
+ # servent que pour le test de formatage.
+ self.formatted_rooms = [
+ Room(name="FSI / {}".format(str(i)))
+ for i in range(5)
+ ] + [
+ Room(name="FSI / Amphi {}".format(str(i)))
+ for i in range(5, 7)
+ ]
+
hours = [({"begin": datetime.time(hour=14, minute=0)},),
({"begin": datetime.time(hour=16, minute=0)},),
({"begin": datetime.time(hour=13, minute=30)},
@@ -364,23 +374,29 @@ class RoomTestCase(TestCase):
course.groups.add(group)
course.rooms.add(room)
- def test_format(self):
- amphis = self.rooms[-2:]
-
+ def __test_format(self, rooms, amphis):
self.assertEqual(format_rooms([]), "")
- self.assertEqual(format_rooms(self.rooms[:1]), "Salle 0")
- self.assertEqual(format_rooms(self.rooms[:2]), "Salles 0, 1")
+ self.assertEqual(format_rooms(rooms[:1]), "Salle 0")
+ self.assertEqual(format_rooms(rooms[:2]), "Salles 0, 1")
self.assertEqual(format_rooms([amphis[0]]), "Amphi 5")
self.assertEqual(format_rooms(amphis), "Amphi 5, Amphi 6")
- self.assertEqual(format_rooms([amphis[0]] + self.rooms[:1]),
+ self.assertEqual(format_rooms([amphis[0]] + rooms[:1]),
"Amphi 5, salle 0")
- self.assertEqual(format_rooms([amphis[0]] + self.rooms[:2]),
+ self.assertEqual(format_rooms([amphis[0]] + rooms[:2]),
"Amphi 5, salles 0, 1")
- self.assertEqual(format_rooms(amphis + self.rooms[:1]),
+ self.assertEqual(format_rooms(amphis + rooms[:1]),
"Amphi 5, Amphi 6, salle 0")
- self.assertEqual(format_rooms(amphis + self.rooms[:2]),
+ self.assertEqual(format_rooms(amphis + rooms[:2]),
"Amphi 5, Amphi 6, salles 0, 1")
+ def test_format(self):
+ amphis = self.rooms[-2:]
+ self.__test_format(self.rooms, amphis)
+
+ def test_reformat(self):
+ amphis = self.formatted_rooms[-2:]
+ self.__test_format(self.formatted_rooms, amphis)
+
def test_qsjps(self):
begin = timezone.make_aware(datetime.datetime.combine(
self.day, datetime.time(hour=15, minute=0)))