From 47fdcc661f358044226f47b42d053c1b95ed2157 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 12 Jul 2015 16:18:49 -0400
Subject: [PATCH] Test: Merged bug.917.t into add.t

---
 test/add.t     | 10 ++++++++
 test/bug.917.t | 63 --------------------------------------------------
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100755 test/bug.917.t

diff --git a/test/add.t b/test/add.t
index 24a909ecc..2a247fc09 100755
--- a/test/add.t
+++ b/test/add.t
@@ -81,6 +81,16 @@ class TestAdd(TestCase):
         code, out, err = self.t("_get 3.description")
         self.assertEqual(out, "release 3.0\n")
 
+    def test_escaped_quotes_are_preserved(self):
+        """Verify that escaped quotes are preserved"""
+        # Bug 917: escaping runs amok
+        self.t("add one \\'two\\' three")
+        self.t("add four \\\"five\\\" six")
+
+        code, out, err = self.t("list")
+        self.assertIn("one 'two' three", out)
+        self.assertIn("four \"five\" six", out)
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
diff --git a/test/bug.917.t b/test/bug.917.t
deleted file mode 100755
index 8f1d278b1..000000000
--- a/test/bug.917.t
+++ /dev/null
@@ -1,63 +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 => 4;
-
-# 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",
-            "confirmation=off\n";
-  close $fh;
-}
-
-# Bug 917: escaping runs amok
-qx{../src/task rc:$rc add one \\'two\\' three 2>&1};
-qx{../src/task rc:$rc add four \\"five\\" six 2>&1};
-my $output = qx{../src/task rc:$rc list 2>&1};
-like ($output, qr/one 'two' three/, "$ut: Single quote preserved");
-like ($output, qr/four "five" six/, "$ut: Double quote preserved");
-
-qx{../src/task rc:$rc 1,2 mod +tag 2>&1};
-$output = qx{../src/task rc:$rc list 2>&1};
-like ($output, qr/one 'two' three/, "$ut: Single quote preserved after modification");
-like ($output, qr/four "five" six/, "$ut: Double quote preserved after modification");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-