diff --git a/test/start.t b/test/start.t index 114b1f5f9..ba9882bc5 100755 --- a/test/start.t +++ b/test/start.t @@ -96,6 +96,37 @@ class TestStart(TestCase): self.assertIn("Nu stannar vi", out) +class TestActiveTaskHandling(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") + + def test_start_nothing(self): + """Verify error message when no tasks are specified""" + code, out, err = self.t.runError ("999 start") + self.assertIn("No tasks specified.", err) + + def test_start_started(self): + """Verify error when starting a started task""" + self.t("1 start") + code, out, err = self.t.runError("1 start") + self.assertIn("Task 1 'one' already started.", out) + + if __name__ == "__main__": from simpletap import TAPTestRunner unittest.main(testRunner=TAPTestRunner()) diff --git a/test/start_NEW.t b/test/start_NEW.t deleted file mode 100755 index 2aa66870c..000000000 --- a/test/start_NEW.t +++ /dev/null @@ -1,72 +0,0 @@ -#!/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") - - def test_start_nothing(self): - """Verify error message when no tasks are specified""" - code, out, err = self.t.runError ("999 start") - self.assertIn("No tasks specified.", err) - - def test_start_started(self): - """Verify error when starting a started task""" - self.t("1 start") - code, out, err = self.t.runError("1 start") - self.assertIn("Task 1 'one' already started.", out) - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4