Add tests for progress colors

Also removed some unreachable branches from the code.

test/test_progress_color.py

+# Topydo - A todo.txt client written in Python.
+# Copyright (C) 2016 Bram Schoenmakers <me@bramschoenmakers.nl>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from freezegun import freeze_time
+import unittest
+
+from test.topydo_testcase import TopydoTest
+from topydo.lib.Config import config
+from topydo.lib.ProgressColor import progress_color
+from topydo.lib.Todo import Todo
+
+def set_256_colors():
+    config(p_overrides={('topydo', 'colors'): '256'})
+
+@freeze_time('2016, 01, 01')
+class ProgressColorTest(TopydoTest):
+
+    def test_progress1(self):
+        """ Test progress of task with no length """
+        color = progress_color(Todo('Foo'))
+        self.assertEqual(color.color, 10)
+
+    def test_progress2(self):
+        """ Test progress of task with no length (but with creation date). """
+        color = progress_color(Todo('2016-02-11 Foo'))
+        self.assertEqual(color.color, 10)
+
+    def test_progress3(self):
+        """ Test progress of task with no length """
+        set_256_colors()
+
+        color = progress_color(Todo('Foo'))
+        self.assertEqual(color.color, 22)
+
+    def test_progress4(self):
+        """ Test progress of task with no length (but with creation date). """
+        set_256_colors()
+
+        color = progress_color(Todo('2016-02-11 Foo'))
+        self.assertEqual(color.color, 22)
+
+    def test_progress5(self):
+        """ Test overdue tasks """
+        color = progress_color(Todo('Foo due:2015-12-31'))
+        self.assertEqual(color.color, 1)
+
+    def test_progress6(self):
+        """ Test overdue tasks """
+        set_256_colors()
+
+        color = progress_color(Todo('Foo due:2015-12-31'))
+        self.assertEqual(color.color, 196)
+
+    def test_progress7(self):
+        """ Due today """
+        color = progress_color(Todo('Foo due:2016-01-01'))
+        self.assertEqual(color.color, 3)
+
+    def test_progress8(self):
+        """ Due today (256) """
+
+        set_256_colors()
+        color = progress_color(Todo('Foo due:2016-01-01'))
+        self.assertEqual(color.color, 202)
+
+    def test_progress9(self):
+        """ Due tomorrow """
+        color = progress_color(Todo('Foo due:2016-01-02'))
+        # a length of 14 days is assumed
+        self.assertEqual(color.color, 3)
+
+    def test_progress10(self):
+        set_256_colors()
+        color = progress_color(Todo('Foo due:2016-01-02'))
+        # a length of 14 days is assumed
+        self.assertEqual(color.color, 208)
+
+    def test_progress11(self):
+        """ Due tomorrow (creation date) """
+        color = progress_color(Todo('2016-01-01 Foo due:2016-01-02'))
+        # a length of 14 days is assumed
+        self.assertEqual(color.color, 10)
+
+    def test_progress12(self):
+        """ Due tomorrow (creation date) """
+        set_256_colors()
+        color = progress_color(Todo('2016-01-01 Foo due:2016-01-02'))
+        self.assertEqual(color.color, 22)
+
+    def test_progress13(self):
+        """ Due tomorrow (recurrence) """
+        color = progress_color(Todo('Foo due:2016-01-02 rec:1d'))
+        self.assertEqual(color.color, 10)
+
+    def test_progress14(self):
+        """ Due tomorrow (recurrence) """
+        set_256_colors()
+        color = progress_color(Todo('Foo due:2016-01-02 rec:1d'))
+        self.assertEqual(color.color, 22)
+
+    def test_progress15(self):
+        """ Due tomorrow (creation date + recurrence) """
+        color = progress_color(Todo('2016-12-01 Foo due:2016-01-02 rec:1d'))
+        self.assertEqual(color.color, 10)
+
+    def test_progress16(self):
+        """ Due tomorrow (creation date + recurrence) """
+        set_256_colors()
+        color = progress_color(Todo('2015-12-01 Foo due:2016-01-02 rec:1d'))
+        self.assertEqual(color.color, 22)
+
+    def test_progress17(self):
+        """ Due tomorrow (creation date + recurrence + start date) """
+        color = progress_color(Todo('2016-12-01 Foo due:2016-01-02 rec:1d t:2016-01-02'))
+        self.assertEqual(color.color, 10)
+
+    def test_progress18(self):
+        """ Due tomorrow (creation date + recurrence + start date) """
+        set_256_colors()
+        color = progress_color(Todo('2015-12-01 Foo due:2016-01-02 rec:1d t:2016-01-02'))
+        self.assertEqual(color.color, 22)
+
+    def test_progress19(self):
+        """ Due tomorrow (creation date + strict recurrence + start date) """
+        color = progress_color(Todo('2016-12-01 Foo due:2016-01-02 rec:+1d t:2016-01-02'))
+        self.assertEqual(color.color, 10)
+
+    def test_progress20(self):
+        """ Due tomorrow (creation date + strict recurrence + start date) """
+        set_256_colors()
+        color = progress_color(Todo('2015-12-01 Foo due:2016-01-02 rec:+1d t:2016-01-02'))
+        self.assertEqual(color.color, 22)
+
+    def test_progress21(self):
+        """ Due tomorrow (creation date + start date) """
+        color = progress_color(Todo('2016-12-01 Foo due:2016-01-02 t:2016-01-02'))
+        self.assertEqual(color.color, 3)
+
+    def test_progress22(self):
+        """ Due tomorrow (creation date + start date) """
+        set_256_colors()
+        color = progress_color(Todo('2015-12-01 Foo due:2016-01-02 t:2016-01-02'))
+        self.assertEqual(color.color, 208)
+
+    def test_progress23(self):
+        """ Due tomorrow (creation date + start date) """
+        color = progress_color(Todo('2016-12-01 Foo due:2016-01-02 t:2015-12-31'))
+        self.assertEqual(color.color, 2)
+
+    def test_progress24(self):
+        """ Due tomorrow (creation date + start date) """
+        set_256_colors()
+        color = progress_color(Todo('2015-12-01 Foo due:2016-01-02 t:2015-12-31'))
+        self.assertEqual(color.color, 118)
+
+    def test_progress25(self):
+        """ Start date after due date """
+        color = progress_color(Todo('Foo due:2016-01-02 t:2016-01-03'))
+        # a length of 14 days is assumed
+        self.assertEqual(color.color, 3)
+
+    def test_progress26(self):
+        """ Start date after due date """
+        set_256_colors()
+        color = progress_color(Todo('Foo due:2016-01-02 t:2016-01-03'))
+        # a length of 14 days is assumed
+        self.assertEqual(color.color, 208)
+
+if __name__ == '__main__':
+    unittest.main()

topydo/lib/Color.py

@@ -83,7 +83,6 @@ class Color:
         elif self.is_neutral():
             return '\033[0m'
 
-        is_low_color = 0 <= self._value < 8
         is_high_color = 8 <= self._value < 16
         is_256 = 16 <= self._value < 255
 
@@ -101,10 +100,9 @@ class Color:
             color = '1;{}'.format(base + self._value - 8)
         elif is_256:
             color = '{};5;{}'.format(base + 8, self._value)
-        elif is_low_color:
-            color = str(base + self._value)
         else:
-            color = ''
+            # it's a low color
+            color = str(base + self._value)
 
         return '\033[{};{}m'.format(
             decoration,

topydo/lib/ProgressColor.py

@@ -41,11 +41,12 @@ def progress_color(p_todo):
         result = 0
 
         def diff_days(p_start, p_end):
-            if p_start < p_end:
-                diff = p_end - p_start
-                return diff.days
-
-            return 0
+            """
+            Returns the difference in days between p_start and p_end, where
+            start is before due.
+            """
+            diff = p_end - p_start
+            return diff.days
 
         if p_todo.has_tag('rec') and p_todo.due_date():
             # add negation, offset is based on due date