From 8551d9649073c196a45a1e6f1bfd685018f83e56 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 Oct 2015 10:49:17 -0400
Subject: [PATCH] Test: Merged tw-1359.t into add.t

---
 test/add.t     | 22 ++++++++++++++++-----
 test/tw-1359.t | 52 --------------------------------------------------
 2 files changed, 17 insertions(+), 57 deletions(-)
 delete mode 100755 test/tw-1359.t

diff --git a/test/add.t b/test/add.t
index bb223170e..c39571179 100755
--- a/test/add.t
+++ b/test/add.t
@@ -57,7 +57,7 @@ class TestAdd(TestCase):
         self.assertEqual(out, "This a TEST\n")
 
     def test_floating_point_preservation(self):
-        """Verify that floating point numbers are unmolested
+        """924: Verify that floating point numbers are unmolested
 
            Bug 924: '1.0' --> '1.0000'
         """
@@ -75,7 +75,7 @@ class TestAdd(TestCase):
         self.assertEqual(out, "release 3.0\n")
 
     def test_escaped_quotes_are_preserved(self):
-        """Verify that escaped quotes are preserved
+        """917: Verify that escaped quotes are preserved
 
            Bug 917: escaping runs amok
         """
@@ -87,7 +87,7 @@ class TestAdd(TestCase):
         self.assertIn("four \"five\" six", out)
 
     def test_extra_space_in_path(self):
-        """Test that path-like args are preserved
+        """884: Test that path-like args are preserved
 
            Bug 884: Extra space in path name.
         """
@@ -99,7 +99,7 @@ class TestAdd(TestCase):
         self.assertIn("/four/five/six/", out)
 
     def test_parentheses_and_spaces_preserved(self):
-        """Test parentheses and spacing is preserved on add
+        """819: Test parentheses and spacing is preserved on add
 
            Bug 819: When I run "task add foo\'s bar." the description of the new task is "foo 's bar .".
         """
@@ -113,7 +113,7 @@ class TestAdd(TestCase):
         self.assertIn("baz (qux)", out)
 
     def test_single_quote_preserved(self):
-        """Test single quote in a terminated multi-word string is preserved
+        """1642: Test single quote in a terminated multi-word string is preserved
 
            TW-1642: After "--", an apostrophe unexpectedly ends the task description
         """
@@ -123,6 +123,18 @@ class TestAdd(TestCase):
         self.assertIn("Return Randy's stuff\n", out)
 
 
+class TestBug1359(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_add_hyphenated(self):
+        """1359: one-two-three" in description triggers Malformed ID error"""
+        self.t("add 'one-two-three.ca'")
+
+        code, out, err = self.t("1 info")
+        self.assertIn("one-two-three.ca", out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/tw-1359.t b/test/tw-1359.t
deleted file mode 100755
index b975f4b09..000000000
--- a/test/tw-1359.t
+++ /dev/null
@@ -1,52 +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
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from basetest import Task, TestCase
-
-
-class TestBug1359(TestCase):
-    def setUp(self):
-        self.t = Task()
-
-    def test_add_hyphenated(self):
-        """"one-two-three" in description triggers Malformed ID error"""
-        self.t("add 'one-two-three.ca'")
-
-        code, out, err = self.t("1 info")
-        self.assertIn("one-two-three.ca", out)
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python