X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/202f4544d3738af03c0c45c5076435fca9c08e9a..1c7620f16af735f074cc9903e15e38260f1faf4e:/tasklib/tests.py

diff --git a/tasklib/tests.py b/tasklib/tests.py
index 3e18bc9..adcb3c8 100644
--- a/tasklib/tests.py
+++ b/tasklib/tests.py
@@ -291,13 +291,6 @@ class TaskTest(TasklibTest):
 
         self.assertRaises(Task.DeletedTask, t.done)
 
-    def test_start_completed_task(self):
-        t = Task(self.tw, description="test task")
-        t.save()
-        t.done()
-
-        self.assertRaises(Task.CompletedTask, t.start)
-
     def test_starting_task(self):
         t = Task(self.tw, description="test task")
         now = t.datetime_normalizer(datetime.datetime.now())
@@ -325,6 +318,69 @@ class TaskTest(TasklibTest):
         self.assertTrue(now.replace(microsecond=0) <= t['end'])
         self.assertEqual(t['status'], 'deleted')
 
+    def test_started_task_active(self):
+        t = Task(self.tw, description="test task")
+        t.save()
+        t.start()
+        self.assertTrue(t.active)
+
+    def test_unstarted_task_inactive(self):
+        t = Task(self.tw, description="test task")
+        self.assertFalse(t.active)
+        t.save()
+        self.assertFalse(t.active)
+
+    def test_start_active_task(self):
+        t = Task(self.tw, description="test task")
+        t.save()
+        t.start()
+        self.assertRaises(Task.ActiveTask, t.start)
+
+    def test_stop_completed_task(self):
+        t = Task(self.tw, description="test task")
+        t.save()
+        t.start()
+        t.done()
+
+        self.assertRaises(Task.InactiveTask, t.stop)
+
+        t = Task(self.tw, description="test task")
+        t.save()
+        t.done()
+
+        self.assertRaises(Task.InactiveTask, t.stop)
+
+    def test_stop_deleted_task(self):
+        t = Task(self.tw, description="test task")
+        t.save()
+        t.start()
+        t.delete()
+        t.stop()
+
+    def test_stop_inactive_task(self):
+        t = Task(self.tw, description="test task")
+        t.save()
+
+        self.assertRaises(Task.InactiveTask, t.stop)
+
+        t = Task(self.tw, description="test task")
+        t.save()
+        t.start()
+        t.stop()
+
+        self.assertRaises(Task.InactiveTask, t.stop)
+
+    def test_stopping_task(self):
+        t = Task(self.tw, description="test task")
+        now = t.datetime_normalizer(datetime.datetime.now())
+        t.save()
+        t.start()
+        t.stop()
+
+        self.assertEqual(t['end'], None)
+        self.assertEqual(t['status'], 'pending')
+        self.assertFalse(t.active)
+
     def test_modify_simple_attribute_without_space(self):
         t = Task(self.tw, description="test")
         t.save()
@@ -671,6 +727,17 @@ class TaskTest(TasklibTest):
 
         self.tw.execute_command(['+test', 'mod', 'unified', 'description'])
 
+    def test_return_all_from_executed_command(self):
+        Task(self.tw, description="test task", tags=['test']).save()
+        out, err, rc = self.tw.execute_command(['count'], return_all=True)
+        self.assertEqual(rc, 0)
+
+    def test_return_all_from_failed_executed_command(self):
+        Task(self.tw, description="test task", tags=['test']).save()
+        out, err, rc = self.tw.execute_command(['countinvalid'],
+            return_all=True, allow_failure=False)
+        self.assertNotEqual(rc, 0)
+
 
 class TaskFromHookTest(TasklibTest):
 
@@ -678,6 +745,7 @@ class TaskFromHookTest(TasklibTest):
         '{"description":"Buy some milk",'
         '"entry":"20141118T050231Z",'
         '"status":"pending",'
+        '"start":"20141119T152233Z",'
         '"uuid":"a360fc44-315c-4366-b70c-ea7e7520b749"}')
 
     input_modify_data = six.StringIO(input_add_data.getvalue() + '\n' +
@@ -706,7 +774,7 @@ class TaskFromHookTest(TasklibTest):
         self.assertEqual(t._original_data['status'], "pending")
         self.assertEqual(t._original_data['description'], "Buy some milk")
         self.assertEqual(set(t._modified_fields),
-                         set(['status', 'description']))
+                         set(['status', 'description', 'start']))
 
     def test_export_data(self):
         t = Task(self.tw, description="test task",
@@ -809,12 +877,12 @@ class DatetimeStringTest(TasklibTest):
         now = local_zone.localize(datetime.datetime.now())
 
         # Assert that both times are not more than 5 seconds apart
-        if sys.version > (2,6):
-            self.assertTrue((now - t['due']).total_seconds() < 5)
-            self.assertTrue((t['due'] - now).total_seconds() < 5)
-        else:
+        if sys.version_info < (2,7):
             self.assertTrue(total_seconds_2_6(now - t['due']) < 5)
             self.assertTrue(total_seconds_2_6(t['due'] - now) < 5)
+        else:
+            self.assertTrue((now - t['due']).total_seconds() < 5)
+            self.assertTrue((t['due'] - now).total_seconds() < 5)
 
     def test_simple_eoy_conversion(self):
         if self.tw.version < six.text_type('2.4.0'):
@@ -934,9 +1002,14 @@ class AnnotationTest(TasklibTest):
 class UnicodeTest(TasklibTest):
 
     def test_unicode_task(self):
-        Task(self.tw, description="†åßk").save()
+        Task(self.tw, description=six.u("†åßk")).save()
         self.tw.tasks.get()
 
+    def test_filter_by_unicode_task(self):
+        Task(self.tw, description=six.u("†åßk")).save()
+        tasks = self.tw.tasks.filter(description=six.u("†åßk"))
+        self.assertEqual(len(tasks), 1)
+
     def test_non_unicode_task(self):
         Task(self.tw, description="test task").save()
         self.tw.tasks.get()