Incorporate changes from #16

tcxparser/tcxparser.py

@@ -54,9 +54,7 @@ def cadence_avg(self):
     @property
     def distance(self):
         distance_values = self.root.findall('.//ns:DistanceMeters', namespaces={'ns': namespace})
-        if distance_values:
-            return distance_values[-1]
-        return 0
+        return distance_values[-1] if distance_values else 0
 
     @property
     def distance_units(self):

tests/test_cycling.py

@@ -0,0 +1,18 @@
+import os
+from unittest import TestCase
+
+from tcxparser import TCXParser
+
+
+class TestParseCyclingTCX(TestCase):
+
+    def setUp(self):
+        tcx_file = 'test2.tcx'
+        path = os.path.join(os.path.dirname(__file__), 'files', tcx_file)
+        self.tcx = TCXParser(path)
+
+    def test_cadence_max_is_correct(self):
+        self.assertEqual(self.tcx.cadence_max, 115)
+
+    def test_cadence_avg_is_correct(self):
+        self.assertEqual(self.tcx.cadence_avg, 82)

tests/test_tcxparser.py

@@ -3,12 +3,12 @@
     from StringIO import StringIO
 except ImportError:
     from io import StringIO
-import unittest
+from unittest import TestCase
 
 from tcxparser import TCXParser
 
 
-class TestParseTCX(unittest.TestCase):
+class TestParseTCX(TestCase):
 
     def setUp(self):
         tcx_file = 'test.tcx'
@@ -79,7 +79,7 @@ def test_descent_is_correct(self):
         self.assertAlmostEqual(self.tcx.descent, 166.307128903)
 
 
-class BugTest(unittest.TestCase):
+class BugTest(TestCase):
 
     def test_single_trackpoint_in_track_is_ok(self):
         "https://github.com/vkurup/python-tcxparser/issues/9"
@@ -123,7 +123,3 @@ def test_no_error_if_no_position(self):
         tcx = TCXParser(tcx_file)
         self.assertEqual(tcx.latitude, None)
         self.assertEqual(tcx.longitude, None)
-
-
-if __name__ == '__main__':
-    unittest.main()