diff --git a/test/add.t b/test/add.t index dad5fb20f..d18cbf5f9 100755 --- a/test/add.t +++ b/test/add.t @@ -148,6 +148,34 @@ class TestBug1419(TestCase): self.assertEqual("one -two\n", out) +class TestBug1527(TestCase): + def setUp(self): + self.t = Task() + + def _validate(self): + code, out, err = self.t() + + expected = "First/Second http://taskwarrior.org" + self.assertIn(expected, out) + + notexpected = "First / Second http: / / taskwarrior.org" + self.assertNotIn(notexpected, out) + notexpected = "First / Second http://taskwarrior.org" + self.assertNotIn(notexpected, out) + notexpected = "First/Second http: / / taskwarrior.org" + self.assertNotIn(notexpected, out) + + def test_add_slash_quoted(self): + """1527: Extra spaces added around slashes when quoted""" + self.t("add First/Second http://taskwarrior.org") + self._validate() + + def test_add_slash_quoted_parser_stop(self): + """1527: Extra spaces added around slashes when quoted after parser stop""" + self.t("add -- First/Second http://taskwarrior.org") + self._validate() + + if __name__ == "__main__": from simpletap import TAPTestRunner unittest.main(testRunner=TAPTestRunner()) diff --git a/test/tw-1527.t b/test/tw-1527.t deleted file mode 100755 index ef093bea0..000000000 --- a/test/tw-1527.t +++ /dev/null @@ -1,70 +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 TestBug1527(TestCase): - def setUp(self): - self.t = Task() - - def _validate(self): - code, out, err = self.t() - - expected = "First/Second http://taskwarrior.org" - self.assertIn(expected, out) - - notexpected = "First / Second http: / / taskwarrior.org" - self.assertNotIn(notexpected, out) - notexpected = "First / Second http://taskwarrior.org" - self.assertNotIn(notexpected, out) - notexpected = "First/Second http: / / taskwarrior.org" - self.assertNotIn(notexpected, out) - - def test_add_slash_quoted(self): - """Extra spaces added around slashes when quoted""" - self.t("add First/Second http://taskwarrior.org") - self._validate() - - def test_add_slash_quoted_parser_stop(self): - """Extra spaces added around slashes when quoted after parser stop""" - self.t("add -- First/Second http://taskwarrior.org") - self._validate() - - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4 ft=python