From 5f617035882da22ff942ee71bcead4d12e535ae9 Mon Sep 17 00:00:00 2001
From: Wilhelm Schuermann <wimschuermann@googlemail.com>
Date: Thu, 28 May 2015 10:11:12 +0200
Subject: [PATCH] TW-1432: start/stop can be issued on completed tasks

- Make "start" set status to pending from completed/deleted.
- Add test to "start_NEW.t", which is to be combined with start.t once
  converted from Perl.
---
 src/commands/CmdStart.cpp |  7 +++++
 test/start_NEW.t          | 62 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100755 test/start_NEW.t

diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index ae173612a..1bb910cfa 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -79,6 +79,13 @@ int CmdStart::execute (std::string& output)
       task.modify (Task::modAnnotate);
       task.setAsNow ("start");
 
+      Task::status status = task.getStatus ();
+      if (status == Task::completed || status == Task::deleted)
+      {
+        // "waiting" handled by Task::validate(), no special care needed here.
+        task.setStatus (Task::pending);
+      }
+
       if (context.config.getBoolean ("journal.time"))
         task.addAnnotation (context.config.get ("journal.time.start.annotation"));
 
diff --git a/test/start_NEW.t b/test/start_NEW.t
new file mode 100755
index 000000000..564e5a149
--- /dev/null
+++ b/test/start_NEW.t
@@ -0,0 +1,62 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# http://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+import sys
+import os
+import unittest
+# Ensure python finds the local simpletap module
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from basetest import Task, TestCase
+
+
+class TestStart(TestCase):
+    def setUp(self):
+        self.t = Task()
+        self.t("add one +one")
+
+    def test_start_completed(self):
+        """Completed task set to pending by start"""
+        self.t("+one done")
+        self.t("+one start")
+        tl = self.t.export()
+        self.assertEqual(tl[0]["status"], "pending")
+
+    def test_start_deleted(self):
+        """Deleted task set to pending by start"""
+        self.t("+one delete")
+        self.t("+one start")
+        tl = self.t.export()
+        self.assertEqual(tl[0]["status"], "pending")
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4