diff --git a/ogn/aprs_utils.py b/ogn/aprs_utils.py index a797e2e..6444043 100644 --- a/ogn/aprs_utils.py +++ b/ogn/aprs_utils.py @@ -1,4 +1,4 @@ -from datetime import * +from datetime import datetime, timedelta import math @@ -32,5 +32,5 @@ def createTimestamp(hhmmss, reference): elif (reference.hour == 0) & (hh == 23): reference = reference - timedelta(days=1) elif (abs(reference.hour - hh) > 1): - raise Exception("Time difference is big. Reference time:%s - timestamp:%s" % (reference, hhmmss)) + raise Exception("Time difference is too big. Reference time:%s - timestamp:%s" % (reference, hhmmss)) return datetime(reference.year, reference.month, reference.day, hh, mm, ss) diff --git a/tests/test_aprs_utils.py b/tests/test_aprs_utils.py index 694cfb6..e24f361 100644 --- a/tests/test_aprs_utils.py +++ b/tests/test_aprs_utils.py @@ -1,10 +1,14 @@ from datetime import datetime import unittest -from ogn.aprs_utils import createTimestamp +from ogn.aprs_utils import dmsToDeg, createTimestamp class TestStringMethods(unittest.TestCase): + def test_dmsToDeg(self): + dms = 50.4830 + self.assertAlmostEqual(dmsToDeg(dms), 50.805, 5) + def test_createTimestamp_seconds_behind(self): timestamp = createTimestamp('235959', datetime(2015, 10, 16, 0, 0, 1)) self.assertEqual(timestamp, datetime(2015, 10, 15, 23, 59, 59))