From 932e10d687dfd68d723a6affc09915b139fd443e Mon Sep 17 00:00:00 2001
From: Rossen Georgiev <zoorty@gmail.com>
Date: Sun, 30 Nov 2014 20:27:55 +0000
Subject: [PATCH] added tests for _parse_comment_telemetry

---
 aprs/parse.py                         |   4 +-
 aprs/version.py                       |   2 +-
 tests/test_parse_comment_telemetry.py | 141 ++++++++++++++++++++++++++
 3 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_parse_comment_telemetry.py

diff --git a/aprs/parse.py b/aprs/parse.py
index e1a45cc..3df93fd 100644
--- a/aprs/parse.py
+++ b/aprs/parse.py
@@ -668,6 +668,6 @@ def _parse_comment_telemetry(text):
                 'bits': "{0:08b}".format(int(temp[6]))
                 })
 
-        return [text, parsed]
+        return (text, parsed)
     else:
-        return [text, {}]
+        return (text, {})
diff --git a/aprs/version.py b/aprs/version.py
index 7c9e66e..400a104 100644
--- a/aprs/version.py
+++ b/aprs/version.py
@@ -1 +1 @@
-__version__ = '0.6.6'
+__version__ = '0.6.7'
diff --git a/tests/test_parse_comment_telemetry.py b/tests/test_parse_comment_telemetry.py
new file mode 100644
index 0000000..7db8a5b
--- /dev/null
+++ b/tests/test_parse_comment_telemetry.py
@@ -0,0 +1,141 @@
+import unittest
+
+from aprs.parse import _parse_comment_telemetry
+from aprs import base91
+from random import randint
+
+
+class ParseCommentTelemetry(unittest.TestCase):
+    def setUp(self):
+        self.b91max = 91**2 - 1
+
+    def genTelem(self, seq, vals, bits=None):
+        data = {
+            'seq': seq,
+            'vals': vals
+            }
+
+        if isinstance(bits, str):
+            data.update({'bits': bits})
+
+        return data
+
+    def telemString(self, telem):
+        text = ['|']
+
+        # sequence
+        if 'seq' in telem:
+            text.append(base91.from_decimal(telem['seq'], 2))
+
+        # telemetry channels
+        if 'vals' in telem:
+            for val in telem['vals']:
+                text.append(base91.from_decimal(val, 2))
+
+        # bits as str(11111111)
+        if 'bits' in telem:
+            val = int(telem['bits'], 2)
+            text.append(base91.from_decimal(val, 2))
+
+        text.append("|")
+
+        return "".join(text)
+
+    def test_random_valid_telemetry(self):
+        for i in xrange(100):
+            vals = [randint(0, self.b91max) for x in xrange(randint(1, 5))]
+
+            bits = None
+
+            if len(vals) is 5 and randint(1, 10) > 5:
+                bits = "{:08b}".format(randint(0, 255))
+
+            testData = self.genTelem(i, vals, bits)
+
+            extra, resData = _parse_comment_telemetry(self.telemString(testData))
+            resData = resData['telemetry']
+
+            # clean up extra data, so we can compare
+            if bits is None:
+                del resData['bits']
+
+            resData['vals'] = resData['vals'][:len(vals)]
+
+            self.assertEqual(testData, resData)
+
+    def test_prefix_sufix_glue(self):
+        testData = [
+            # resulting extra should be 'asdzxc'
+            ['asd', '|"!"!|', 'zxc'],
+            ['', '|"!"!|', 'zxc'],
+            ['asd', '|"!"!|', ''],
+            # empty extra
+            ['', '|"!"!|', ''],
+            # should parse only first occurance of |ss11|
+            ['asd', '|"!"!|', '|"!"!|'],
+            ['', '|"!"!|', '|"!"!|'],
+            ['|aa|', '|"!"!|', '|"!"!|'],
+            ['|aa|', '|"!"!|', ''],
+            ]
+
+        for datum in testData:
+            extra, telem = _parse_comment_telemetry("".join(datum))
+
+            self.assertEqual(datum[0]+datum[2], extra)
+
+    def test_invalid_telemetry(self):
+        testData = [
+            "||",
+            # odd number of characters between pipes
+            "|!!|",
+            "|!!!|",
+            "|!!!!!|",
+            "|!!!!!!!|",
+            "|!!!!!!!!!|",
+            "|!!!!!!!!!!!|",
+            "|!!!!!!!!!!!!!|",
+            # invalid characters in sequence
+            "| a|",
+            "|a |",
+            "|aa  |",
+            "|aaaa  |",
+            "|aaaaaa  |",
+            "|aaaaaaaa  |",
+            "|aaaaaaaaaa  |",
+            "|aaaaaaaaaaaa  |",
+            "|ss11223344556677|",  # over 8 fields
+            ]
+
+        for datum in testData:
+            extra, telem = _parse_comment_telemetry(datum)
+
+            self.assertEqual(datum, extra)
+
+    def test_output_format(self):
+        parsedOutput = _parse_comment_telemetry("|aabb|")
+
+        self.assertTrue(isinstance(parsedOutput, tuple))
+        self.assertTrue(len(parsedOutput) == 2)
+
+        extra, telemetry = parsedOutput
+
+        self.assertTrue(isinstance(extra, str))
+        self.assertTrue(isinstance(telemetry, dict))
+
+        self.assertTrue('telemetry' in telemetry)
+
+        self.assertTrue('seq' in telemetry['telemetry'])
+        self.assertTrue(isinstance(telemetry['telemetry']['seq'], int))
+
+        self.assertTrue('vals' in telemetry['telemetry'])
+        self.assertTrue(isinstance(telemetry['telemetry']['vals'], list))
+        self.assertTrue(len(telemetry['telemetry']['vals']) == 5)
+
+        self.assertTrue('bits' in telemetry['telemetry'])
+        self.assertTrue(isinstance(telemetry['telemetry']['bits'], str))
+        self.assertTrue(len(telemetry['telemetry']['bits']) == 8)
+        self.assertTrue(len(telemetry['telemetry']['bits'].replace('0', '')) == 0)
+
+
+if __name__ == '__main__':
+    unittest.main()