From 1da1d472dfc56e9e4fd5bfdd9dfe47efb677c0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Sat, 16 Dec 2017 17:28:32 +0100 Subject: [PATCH] Refactoring --- tests/collect/test_logbook.py | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/tests/collect/test_logbook.py b/tests/collect/test_logbook.py index eac6909..088d72c 100644 --- a/tests/collect/test_logbook.py +++ b/tests/collect/test_logbook.py @@ -3,9 +3,8 @@ import os from sqlalchemy.sql import null -from ogn.model import Logbook, Airport, Device +from ogn.model import Logbook, Airport, Device, TakeoffLanding from ogn.collect.logbook import update_logbook -from ogn.model.takeoff_landing import TakeoffLanding class TestDB(unittest.TestCase): @@ -54,27 +53,6 @@ class TestDB(unittest.TestCase): session = self.session return session.query(Logbook).order_by(Logbook.takeoff_airport_id, Logbook.reftime).all() - def assert_entries(self, koen_to=0, koen_ldg=0, koen_complete=0, ohl_to=0, ohl_ldg=0, ohl_complete=0): - session = self.session - - entries = len(session.query(Logbook).filter(Logbook.takeoff_airport_id == self.koenigsdorf.id).filter(Logbook.landing_airport_id == null()).all()) - self.assertEqual(entries, koen_to) - - entries = len(session.query(Logbook).filter(Logbook.landing_airport_id == self.koenigsdorf.id).filter(Logbook.takeoff_airport_id == null()).all()) - self.assertEqual(entries, koen_ldg) - - entries = len(session.query(Logbook).filter(Logbook.takeoff_airport_id == Logbook.landing_airport_id == self.koenigsdorf.id).all()) - self.assertEqual(entries, koen_complete) - - entries = len(session.query(Logbook).filter(Logbook.takeoff_airport_id == self.ohlstadt.id).filter(Logbook.landing_airport_id == null()).all()) - self.assertEqual(entries, ohl_to) - - entries = len(session.query(Logbook).filter(Logbook.landing_airport_id == self.ohlstadt.id).filter(Logbook.takeoff_airport_id == null()).all()) - self.assertEqual(entries, ohl_ldg) - - entries = len(session.query(Logbook).filter(Logbook.takeoff_airport_id == Logbook.landing_airport_id == self.ohlstadt.id).all()) - self.assertEqual(entries, ohl_complete) - def test_single_takeoff(self): session = self.session