From f2e32739cf8973ebed37d9c41a23e7f8d956ce3a Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc+taskw@gmail.com>
Date: Thu, 11 Jun 2015 00:46:51 +0100
Subject: [PATCH] Tests: bug.440 merged with append.t

---
 test/append.t  | 24 +++++++++++++++++
 test/bug.440.t | 70 --------------------------------------------------
 2 files changed, 24 insertions(+), 70 deletions(-)
 delete mode 100755 test/bug.440.t

diff --git a/test/append.t b/test/append.t
index 2143a7737..84a6ce537 100755
--- a/test/append.t
+++ b/test/append.t
@@ -64,6 +64,30 @@ class TestAppend(TestCase):
         self.assertNotIn(notexpected, out)
 
 
+class TestBug440(TestCase):
+    # Bug #440: Parser recognizes an attempt to simultaneously subst and
+    #           append, but doesn't do it
+    def setUp(self):
+        self.t = Task()
+
+    def test_subst_and_append_at_once(self):
+        """Simultaneous substitution and append"""
+        self.t(("add", "Foo"))
+        self.t(("add", "Foo"))
+
+        self.t(("1", "append", "/Foo/Bar/", "Appendtext"))
+        self.t(("2", "append", "Appendtext", "/Foo/Bar/"))
+
+        code1, out1, err1 = self.t(("1", "ls"))
+        code2, out2, err2 = self.t(("2", "ls"))
+
+        self.assertNotIn("Foo", out1)
+        self.assertRegexpMatches(out1, "\w+ Appendtext")
+
+        self.assertNotIn("Foo", out2)
+        self.assertRegexpMatches(out2, "\w+ Appendtext")
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/bug.440.t b/test/bug.440.t
deleted file mode 100755
index 9022322ec..000000000
--- a/test/bug.440.t
+++ /dev/null
@@ -1,70 +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 #440: Parser recognizes an attempt to simultaneously subst and append, but doesn't do it
-
-# Create a task and attempt simultaneous subst and appends, both permutations
-
-qx{../src/task rc:$rc add Foo 2>&1};
-qx{../src/task rc:$rc add Foo 2>&1};
-
-qx{../src/task rc:$rc 1 append /Foo/Bar/ Appendtext 2>&1};
-qx{../src/task rc:$rc 2 append Appendtext /Foo/Bar/ 2>&1};
-
-my $output1 = qx{../src/task rc:$rc 1 ls 2>&1};
-my $output2 = qx{../src/task rc:$rc 2 ls 2>&1};
-
-unlike ($output1, qr/Foo/,            "$ut: simultaneous subst and append - subst");
-like   ($output1, qr/\w+ Appendtext/, "$ut: simultaneous subst and append - append");
-
-unlike ($output2, qr/Foo/,            "$ut: simultaneous append and subst - subst");
-like   ($output2, qr/\w+ Appendtext/, "$ut: simultaneous append and subst - append");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;