From 6801b55585d157e4617ec95ea7897df498b47dcd Mon Sep 17 00:00:00 2001 From: "kammermark@gmx.de" Date: Fri, 20 Nov 2015 11:36:42 +0100 Subject: [PATCH] Test case cleanup --- tests/custom_ddb.txt | 2 +- tests/model/test_aircraft_beacon.py | 70 ++++++++++++----------- tests/model/test_beacon.py | 3 +- tests/model/test_receiver_beacon.py | 42 ++++++++------ tests/test_aprs_utils.py | 2 +- tests/{test_ognutils.py => test_utils.py} | 5 +- 6 files changed, 69 insertions(+), 55 deletions(-) rename tests/{test_ognutils.py => test_utils.py} (94%) diff --git a/tests/custom_ddb.txt b/tests/custom_ddb.txt index c3f2817..a9f1365 100644 --- a/tests/custom_ddb.txt +++ b/tests/custom_ddb.txt @@ -1,4 +1,4 @@ #DEVICE_TYPE,DEVICE_ID,AIRCRAFT_MODEL,REGISTRATION,CN,TRACKED,IDENTIFIED -'F','DD4711','HK36 TTC','D-EULE','','Y','Y' +'F','DD4711','HK36 TTC','D-EULE','CU','Y','Y' 'F','DD0815','Ventus 2cxM','D-1234','','Y','Y' 'F','DD3141','Arcus T','OE-4321','','Y','Y' \ No newline at end of file diff --git a/tests/model/test_aircraft_beacon.py b/tests/model/test_aircraft_beacon.py index b210234..b7062f4 100644 --- a/tests/model/test_aircraft_beacon.py +++ b/tests/model/test_aircraft_beacon.py @@ -2,58 +2,64 @@ import unittest from ogn.aprs_utils import ms2fpm from ogn.model import Beacon, AircraftBeacon +from ogn.exceptions import OgnParseError class TestStringMethods(unittest.TestCase): + def test_fail_validation(self): + aircraft_beacon = AircraftBeacon() + with self.assertRaises(OgnParseError): + aircraft_beacon.parse("notAValidToken") + def test_basic(self): - position = AircraftBeacon() - position.parse("id0ADDA5BA -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5 hear1084 hearB597 hearB598") + aircraft_beacon = AircraftBeacon() + aircraft_beacon.parse("id0ADDA5BA -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5 hear1084 hearB597 hearB598") - self.assertFalse(position.stealth) - self.assertEqual(position.address, "DDA5BA") - self.assertAlmostEqual(position.climb_rate*ms2fpm, -454, 2) - self.assertEqual(position.turn_rate, -1.1) - self.assertEqual(position.signal_strength, 8.8) - self.assertEqual(position.error_count, 0) - self.assertEqual(position.frequency_offset, 51.2) - self.assertEqual(position.gps_status, '4x5') + self.assertFalse(aircraft_beacon.stealth) + self.assertEqual(aircraft_beacon.address, "DDA5BA") + self.assertAlmostEqual(aircraft_beacon.climb_rate*ms2fpm, -454, 2) + self.assertEqual(aircraft_beacon.turn_rate, -1.1) + self.assertEqual(aircraft_beacon.signal_strength, 8.8) + self.assertEqual(aircraft_beacon.error_count, 0) + self.assertEqual(aircraft_beacon.frequency_offset, 51.2) + self.assertEqual(aircraft_beacon.gps_status, '4x5') - self.assertEqual(len(position.heared_aircraft_IDs), 3) - self.assertEqual(position.heared_aircraft_IDs[0], '1084') - self.assertEqual(position.heared_aircraft_IDs[1], 'B597') - self.assertEqual(position.heared_aircraft_IDs[2], 'B598') + self.assertEqual(len(aircraft_beacon.heared_aircraft_IDs), 3) + self.assertEqual(aircraft_beacon.heared_aircraft_IDs[0], '1084') + self.assertEqual(aircraft_beacon.heared_aircraft_IDs[1], 'B597') + self.assertEqual(aircraft_beacon.heared_aircraft_IDs[2], 'B598') def test_stealth(self): - position = AircraftBeacon() - position.parse("id0ADD1234") - self.assertFalse(position.stealth) + aircraft_beacon = AircraftBeacon() + aircraft_beacon.parse("id0ADD1234") + self.assertFalse(aircraft_beacon.stealth) - position.parse("id8ADD1234") - self.assertTrue(position.stealth) + aircraft_beacon.parse("id8ADD1234") + self.assertTrue(aircraft_beacon.stealth) def test_v024(self): - position = AircraftBeacon() - position.parse("!W26! id21400EA9 -2454fpm +0.9rot 19.5dB 0e -6.6kHz gps1x1 s6.02 h44 rDF0C56") + aircraft_beacon = AircraftBeacon() + aircraft_beacon.parse("!W26! id21400EA9 -2454fpm +0.9rot 19.5dB 0e -6.6kHz gps1x1 s6.02 h44 rDF0C56") - self.assertEqual(position.latitude, 2 / 1000 / 60) - self.assertEqual(position.longitude, 6 / 1000 / 60) - self.assertEqual(position.software_version, 6.02) - self.assertEqual(position.hardware_version, 44) - self.assertEqual(position.real_id, "DF0C56") + self.assertEqual(aircraft_beacon.latitude, 2 / 1000 / 60) + self.assertEqual(aircraft_beacon.longitude, 6 / 1000 / 60) + self.assertEqual(aircraft_beacon.software_version, 6.02) + self.assertEqual(aircraft_beacon.hardware_version, 44) + self.assertEqual(aircraft_beacon.real_id, "DF0C56") def test_v024_ogn_tracker(self): - position = AircraftBeacon() - position.parse("!W34! id07353800 +020fpm -14.0rot FL004.43 38.5dB 0e -2.9kHz") + aircraft_beacon = AircraftBeacon() + aircraft_beacon.parse("!W34! id07353800 +020fpm -14.0rot FL004.43 38.5dB 0e -2.9kHz") - self.assertEqual(position.flightlevel, 4.43) + self.assertEqual(aircraft_beacon.flightlevel, 4.43) def test_copy_constructor(self): beacon = Beacon() beacon.parse("FLRDDA5BA>APRS,qAS,LFMX:/160829h4415.41N/00600.03E'342/049/A=005524 id0ADDA5BA -454fpm -1.1rot 8.8dB 0e +51.2kHz gps4x5") - position = AircraftBeacon(beacon) + aircraft_beacon = AircraftBeacon(beacon) - self.assertEqual(position.name, 'FLRDDA5BA') - self.assertEqual(position.address, 'DDA5BA') + self.assertEqual(aircraft_beacon.name, 'FLRDDA5BA') + self.assertEqual(aircraft_beacon.address, 'DDA5BA') if __name__ == '__main__': diff --git a/tests/model/test_beacon.py b/tests/model/test_beacon.py index 51c873b..388c299 100644 --- a/tests/model/test_beacon.py +++ b/tests/model/test_beacon.py @@ -2,12 +2,13 @@ import unittest from ogn.aprs_utils import dmsToDeg, kts2kmh, m2feet from ogn.model import Beacon +from ogn.exceptions import AprsParseError class TestStringMethods(unittest.TestCase): def test_fail_validation(self): beacon = Beacon() - with self.assertRaises(Exception): + with self.assertRaises(AprsParseError): beacon.parse("notAValidString") def test_basic(self): diff --git a/tests/model/test_receiver_beacon.py b/tests/model/test_receiver_beacon.py index 5630cb0..1f8bdaa 100644 --- a/tests/model/test_receiver_beacon.py +++ b/tests/model/test_receiver_beacon.py @@ -1,31 +1,37 @@ import unittest from ogn.model import ReceiverBeacon +from ogn.exceptions import OgnParseError class TestStringMethods(unittest.TestCase): - def test_v022(self): - receiver = ReceiverBeacon() + def test_fail_validation(self): + receiver_beacon = ReceiverBeacon() + with self.assertRaises(OgnParseError): + receiver_beacon.parse("notAValidToken") - receiver.parse("v0.2.2.x86 CPU:0.5 RAM:669.9/887.7MB NTP:1.0ms/+6.2ppm +52.0C RF:+0.06dB") - self.assertEqual(receiver.version, '0.2.2') - self.assertEqual(receiver.platform, 'x86') - self.assertEqual(receiver.cpu_load, 0.5) - self.assertEqual(receiver.cpu_temp, 52.0) - self.assertEqual(receiver.free_ram, 669.9) - self.assertEqual(receiver.total_ram, 887.7) - self.assertEqual(receiver.ntp_error, 1.0) - self.assertEqual(receiver.rec_crystal_correction, 0.0) - self.assertEqual(receiver.rec_crystal_correction_fine, 0.0) - self.assertEqual(receiver.rec_input_noise, 0.06) + def test_v022(self): + receiver_beacon = ReceiverBeacon() + + receiver_beacon.parse("v0.2.2.x86 CPU:0.5 RAM:669.9/887.7MB NTP:1.0ms/+6.2ppm +52.0C RF:+0.06dB") + self.assertEqual(receiver_beacon.version, '0.2.2') + self.assertEqual(receiver_beacon.platform, 'x86') + self.assertEqual(receiver_beacon.cpu_load, 0.5) + self.assertEqual(receiver_beacon.cpu_temp, 52.0) + self.assertEqual(receiver_beacon.free_ram, 669.9) + self.assertEqual(receiver_beacon.total_ram, 887.7) + self.assertEqual(receiver_beacon.ntp_error, 1.0) + self.assertEqual(receiver_beacon.rec_crystal_correction, 0.0) + self.assertEqual(receiver_beacon.rec_crystal_correction_fine, 0.0) + self.assertEqual(receiver_beacon.rec_input_noise, 0.06) def test_v021(self): - receiver = ReceiverBeacon() + receiver_beacon = ReceiverBeacon() - receiver.parse("v0.2.1 CPU:0.8 RAM:25.6/458.9MB NTP:0.0ms/+0.0ppm +51.9C RF:+26-1.4ppm/-0.25dB") - self.assertEqual(receiver.rec_crystal_correction, 26) - self.assertEqual(receiver.rec_crystal_correction_fine, -1.4) - self.assertEqual(receiver.rec_input_noise, -0.25) + receiver_beacon.parse("v0.2.1 CPU:0.8 RAM:25.6/458.9MB NTP:0.0ms/+0.0ppm +51.9C RF:+26-1.4ppm/-0.25dB") + self.assertEqual(receiver_beacon.rec_crystal_correction, 26) + self.assertEqual(receiver_beacon.rec_crystal_correction_fine, -1.4) + self.assertEqual(receiver_beacon.rec_input_noise, -0.25) if __name__ == '__main__': diff --git a/tests/test_aprs_utils.py b/tests/test_aprs_utils.py index e24f361..5f8f0dd 100644 --- a/tests/test_aprs_utils.py +++ b/tests/test_aprs_utils.py @@ -1,5 +1,5 @@ -from datetime import datetime import unittest +from datetime import datetime from ogn.aprs_utils import dmsToDeg, createTimestamp diff --git a/tests/test_ognutils.py b/tests/test_utils.py similarity index 94% rename from tests/test_ognutils.py rename to tests/test_utils.py index c4bb961..ef395dd 100644 --- a/tests/test_ognutils.py +++ b/tests/test_utils.py @@ -1,6 +1,7 @@ import unittest + from ogn.utils import get_ddb, get_country_code, wgs84_to_sphere -from ogn.model.address_origin import AddressOrigin +from ogn.model import AddressOrigin class TestStringMethods(unittest.TestCase): @@ -16,7 +17,7 @@ class TestStringMethods(unittest.TestCase): self.assertEqual(device.address, 'DD4711') self.assertEqual(device.aircraft, 'HK36 TTC') self.assertEqual(device.registration, 'D-EULE') - self.assertEqual(device.competition, '') + self.assertEqual(device.competition, 'CU') self.assertTrue(device.tracked) self.assertTrue(device.identified)