Fix drunk list db UT

[hubacji1/coffee-getter.git] / ut / test_db.py

diff --git a/ut/test_db.py b/ut/test_db.py
index 17dc3e925758ed9f24c517414c0e447659979712..fe67e71566f31a56403ece26a7b4cc5fe451a992 100644 (file)
--- a/ut/test_db.py
+++ b/ut/test_db.py
@@ -75,6 +75,7 @@ INSERT INTO coffees (id, flavor, time) VALUES
 ('3333', 'espresso lungo', datetime('now', 'localtime', '-99 seconds')),
 ('3333', 'Club-Mate 0,33 l', datetime('now', 'localtime', '-99 seconds')),
 ('3333', 'espresso lungo', datetime('now', 'localtime', '-95 second')),
+('3333', 'Club-Mate 0,5 l', datetime('now', 'localtime', '-95 second')),
 ('3333', 'Club-Mate 0,33 l', datetime('now', 'localtime', '-95 second'));
     """)
     con.close()
@@ -113,8 +114,8 @@ class TopMateDrinkers(TestCase):
                 top,
                 [
                     ("tester", 4*0.5 + 4*0.33),
+                    ("clone", 0.5 + 2*0.33),
                     ("newer", 2*0.33),
-                    ("clone", 2*0.33),
                 ]
             )
         finally:
@@ -211,6 +212,7 @@ class DrunkSum(TestCase):
             drunk = db.getDrunkSum("Club-Mate 0,5 l", self.lwstr, self.tdystr)
             self.assertEqual(drunk, [
                 ("tester", 4),
+                ("clone", 1),
             ])
         finally:
             delete_test_db(TESTDB_FILENAME)
@@ -243,7 +245,24 @@ class DrunkSum(TestCase):
             self.assertEqual(drunk, [
                 ("tester", 8),
                 ("newer", 2),
-                ("clone", 2),
+                ("clone", 3),
             ])
         finally:
             delete_test_db(TESTDB_FILENAME)
+
+    def test_all_mate_list(self):
+        create_test_db(TESTDB_FILENAME)
+        try:
+            db = Db(TESTDB_FILENAME)
+            drunk = db.getDrunkList(
+                "Club-Mate 0,5 l;Club-Mate 0,33 l",
+                self.lwstr,
+                self.tdystr
+            )
+            self.assertEqual(drunk, {
+                "tester": [4, 4],
+                "newer": [0, 2],
+                "clone": [1, 2],
+            })
+        finally:
+            delete_test_db(TESTDB_FILENAME)