diff --git a/README.md b/README.md index 6034e9e..4f7b8b0 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ available commands: drop Drop all tables. import_airports Import airports from a ".cup" file import_ddb Import registered devices from the DDB. - import_file Import registered devices from a local file. + import_ddb_file Import registered devices from a local file. init Initialize the database. upgrade Upgrade database to the latest version. diff --git a/ogn/collect/database.py b/ogn/collect/database.py index d954386..2b183fe 100644 --- a/ogn/collect/database.py +++ b/ogn/collect/database.py @@ -42,7 +42,7 @@ def import_ddb(session=None): @app.task -def import_file(session=None, path='tests/custom_ddb.txt'): +def import_ddb_file(session=None, path='tests/custom_ddb.txt'): """Import registered devices from a local file.""" if session is None: diff --git a/tests/collect/test_database.py b/tests/collect/test_database.py index af2b05c..8d0cd39 100644 --- a/tests/collect/test_database.py +++ b/tests/collect/test_database.py @@ -1,8 +1,8 @@ import unittest import os -from ogn.model import AircraftBeacon, ReceiverBeacon, Device, Receiver -from ogn.collect.database import update_devices, update_receivers +from ogn.model import AircraftBeacon, ReceiverBeacon, Device, Receiver, DeviceInfo +from ogn.collect.database import update_devices, update_receivers, import_ddb_file class TestDB(unittest.TestCase): @@ -33,6 +33,7 @@ class TestDB(unittest.TestCase): def tearDown(self): session = self.session + session.execute("DELETE FROM device_info") session.execute("DELETE FROM device") session.execute("DELETE FROM receiver") session.execute("DELETE FROM aircraft_beacon") @@ -117,6 +118,14 @@ class TestDB(unittest.TestCase): self.assertEqual(self.rb03.receiver_id, receivers[0].id) self.assertEqual(self.ab01.receiver_id, receivers[0].id) + def test_import_ddb_file(self): + session = self.session + + import_ddb_file(session, path=os.path.dirname(__file__) + '/../custom_ddb.txt') + + device_infos = session.query(DeviceInfo).all() + self.assertEqual(len(device_infos), 6) + if __name__ == '__main__': unittest.main()