Split naviter test into aprs part and comment part

tests/parser/test_beacon.py

@@ -53,6 +53,13 @@ class TestStringMethods(unittest.TestCase):
 
         self.assertEqual(message['comment'], None)
 
+    def test_v026_relay(self):
+        # beacons can be relayed
+        raw_message = "FLRFFFFFF>OGNAVI,NAV07220E*,qAS,NAVITER:/092002h1000.00S/01000.00W'000/000/A=003281 !W00! id2820FFFFFF +300fpm +1.7rot"
+        message = parse_aprs(raw_message, reference_date=datetime(2015, 1, 1, 8, 56, 0))
+
+        self.assertEqual(message['relay'], "NAV07220E")
+
 
 if __name__ == '__main__':
     unittest.main()

tests/parser/test_beacon_naviter.py

@@ -1,20 +1,14 @@
 import unittest
 
 from ogn.parser.utils import ms2fpm
-from ogn.parser.parse import parse_aprs, parse_ogn_aircraft_beacon
+from ogn.parser.parse import parse_ogn_aircraft_beacon
 
 
 class TestStringMethods(unittest.TestCase):
-    def test_basic(self):
-        message = parse_aprs("NAV042121>OGNAVI,qAS,NAVITER:/140648h4550.36N/01314.85E'090/152/A=001086 !W47! id0440042121 +000fpm +0.5rot")
-        self.assertEqual(message['name'], "NAV042121")
-        self.assertEqual(message['dstcall'], "OGNAVI")
-        self.assertEqual(message['receiver_name'], "NAVITER")
-        # ... APRS format is tested enough
-        self.assertEqual(message['comment'], "id0440042121 +000fpm +0.5rot")
+    def test_OGNAVI_1(self):
+        message = "id0440042121 +000fpm +0.5rot"
+        naviter_message = parse_ogn_aircraft_beacon(message, dstcall='OGNAVI')
 
-        naviter_message = parse_ogn_aircraft_beacon(message['comment'], dstcall=message['dstcall'])
-        # NAVITER specific values
         # id0440042121 == 0b0000 0100 0100 0000 0000 0100 0010 0001 0010 0001
         # bit 0: stealth mode
         # bit 1: do not track mode
@@ -32,13 +26,6 @@ class TestStringMethods(unittest.TestCase):
         self.assertAlmostEqual(naviter_message['climb_rate'] * ms2fpm, 0, 2)
         self.assertEqual(naviter_message['turn_rate'], 0.5)
 
-    def test_relayed(self):
-        message = parse_aprs("FLRFFFFFF>OGNAVI,NAVABCDEF*,qAS,NAVITER:/092002h1000.00S/01000.00W'000/000/A=003281 !W00! id2820FFFFFF +300fpm +1.7rot")
-
-        self.assertEqual(message['name'], "FLRFFFFFF")
-        self.assertEqual(message['dstcall'], "OGNAVI")
-        self.assertEqual(message['relay_id'], "NAVABCDEF")
-        self.assertEqual(message['receiver_name'], "NAVITER")
 
 if __name__ == '__main__':
     unittest.main()