From cd1b7d9bb50ed2209f3c83eab04c15213e1fa5fb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 12 Jul 2015 16:55:43 -0400
Subject: [PATCH] Test: Merged bug.819.t into add.t

---
 test/add.t     | 38 ++++++++++++++++++--------------
 test/bug.819.t | 60 --------------------------------------------------
 2 files changed, 21 insertions(+), 77 deletions(-)
 delete mode 100755 test/bug.819.t

diff --git a/test/add.t b/test/add.t
index 070c07048..4827a1069 100755
--- a/test/add.t
+++ b/test/add.t
@@ -33,7 +33,6 @@ import unittest
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from basetest import Task, TestCase
-from basetest.utils import UUID_REGEXP
 
 
 class TestAdd(TestCase):
@@ -43,27 +42,19 @@ class TestAdd(TestCase):
     def test_add(self):
         "Testing add command"
 
-        self.t(("add", "This is a test"))
-        code, out, err = self.t(("info", "1"))
-
-        self.assertRegexpMatches(out, "ID\s+1\n")
-        self.assertRegexpMatches(out, "Description\s+This is a test\n")
-        self.assertRegexpMatches(out, "Status\s+Pending\n")
-        self.assertRegexpMatches(out, "UUID\s+" + UUID_REGEXP + "\n")
+        self.t("add This is a test")
+        code, out, err = self.t("_get 1.description")
+        self.assertEqual(out, "This is a test\n")
 
     def test_modify_slash(self):
         "Test the /// modifier"
 
-        self.t(("add", "This is a test"))
-        self.t(("1", "modify", "/test/TEST/"))
-        self.t(("1", "modify", "/is //"))
+        self.t("add This is a test")
+        self.t("1 modify /test/TEST/")
+        self.t("1 modify '/is //'")
 
-        code, out, err = self.t(("info", "1"))
-
-        self.assertRegexpMatches(out, "ID\s+1\n")
-        self.assertRegexpMatches(out, "Status\s+Pending\n")
-        self.assertRegexpMatches(out, "Description\s+This a TEST\n")
-        self.assertRegexpMatches(out, "UUID\s+" + UUID_REGEXP + "\n")
+        code, out, err = self.t("_get 1.description")
+        self.assertEqual(out, "This a TEST\n")
 
     def test_floating_point_preservation(self):
         """Verify that floating point numbers are unmolested
@@ -107,6 +98,19 @@ class TestAdd(TestCase):
         self.assertIn("/one/two/three/", out)
         self.assertIn("/four/five/six/", out)
 
+    def test_parentheses_and_spaces_preserved(self):
+        """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 .".
+        """
+        self.t("add foo\\\'s bar")
+        self.t("add foo (bar)")
+        self.t("add 'baz (qux)'")
+
+        code, out, err = self.t("ls")
+        self.assertIn("foo's bar", out)
+        self.assertIn("foo (bar)", out)
+        self.assertIn("baz (qux)", out)
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
diff --git a/test/bug.819.t b/test/bug.819.t
deleted file mode 100755
index 3ad765720..000000000
--- a/test/bug.819.t
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /usr/bin/env perl
-################################################################################
-##
-## 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
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 3;
-
-# Ensure environment has no influence.
-delete $ENV{'TASKDATA'};
-delete $ENV{'TASKRC'};
-
-use File::Basename;
-my $ut = basename ($0);
-my $rc = $ut . '.rc';
-
-# Create the rc file.
-if (open my $fh, '>', $rc)
-{
-  print $fh "data.location=.\n";
-  close $fh;
-}
-
-# Bug 819: When I run "task add foo\'s bar." the description of the new task is "foo 's bar .".
-qx{../src/task rc:$rc add foo\\'s bar. 2>&1};
-qx{../src/task rc:$rc add foo \\(bar\\) 2>&1};
-qx{../src/task rc:$rc add 'baz (qux)' 2>&1};
-
-my $output = qx{../src/task rc:$rc ls 2>&1};
-like ($output, qr/foo's bar\./, "$ut: foo's bar. --> preserved");
-like ($output, qr/foo \(bar\)/, "$ut: foo \(bar\) --> preserved");
-like ($output, qr/baz \(qux\)/, "$ut: baz \(qux\) --> preserved");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-