From 3b2b40f3068bdd659187e970eec794b2fd5effee Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 12 Jul 2015 16:31:35 -0400
Subject: [PATCH] Test: Merged bug.906.t into project.t

---
 test/bug.906.t | 80 --------------------------------------------------
 test/project.t | 33 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 80 deletions(-)
 delete mode 100755 test/bug.906.t

diff --git a/test/bug.906.t b/test/bug.906.t
deleted file mode 100755
index ed3e1ac55..000000000
--- a/test/bug.906.t
+++ /dev/null
@@ -1,80 +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 => 15;
-
-# 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 906: escaping runs amok
-qx{../src/task rc:$rc add zero 2>&1};
-qx{../src/task rc:$rc add one  pro:a.b 2>&1};
-qx{../src/task rc:$rc add two  pro:a 2>&1};
-my $output = qx{../src/task rc:$rc list 2>&1};
-like   ($output, qr/zero/, "$ut: list - zero included");
-like   ($output, qr/one/,  "$ut: list - one included");
-like   ($output, qr/two/,  "$ut: list - two included");
-
-$output = qx{../src/task rc:$rc list pro:a 2>&1};
-unlike ($output, qr/zero/, "$ut: list - zero excluded");
-like   ($output, qr/one/,  "$ut: list - one included");
-like   ($output, qr/two/,  "$ut: list - two included");
-
-$output = qx{../src/task rc:$rc list pro:a.b 2>&1};
-unlike ($output, qr/zero/, "$ut: list - zero included");
-like   ($output, qr/one/,  "$ut: list - one excluded");
-unlike ($output, qr/two/,  "$ut: list - two included");
-
-$output = qx{../src/task rc:$rc list pro.not:a 2>&1};
-like   ($output, qr/zero/, "$ut: list - zero included");
-like   ($output, qr/one/,  "$ut: list - one included");
-unlike ($output, qr/two/,  "$ut: list - two excluded");
-
-$output = qx{../src/task rc:$rc list pro.not:a.b 2>&1};
-like   ($output, qr/zero/, "$ut: list - zero included");
-unlike ($output, qr/one/,  "$ut: list - one excluded");
-like   ($output, qr/two/,  "$ut: list - two included");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/project.t b/test/project.t
index 398d77112..87ff84b04 100755
--- a/test/project.t
+++ b/test/project.t
@@ -228,6 +228,39 @@ class TestBug605(TestCase):
         code, out, err = self.t(("2", "done"))
         self.assertIn("is 100% complete", err)
 
+class TestBug906(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_project_hierarchy_filter(self):
+        """Test project hierarchy filters
+
+           Bug 906
+        """
+        self.t("add zero")
+        self.t("add one pro:a.b")
+        self.t("add two pro:a")
+
+        code, out, err = self.t("pro:a list")
+        self.assertNotIn("zero", out)
+        self.assertIn("one", out)
+        self.assertIn("two", out)
+
+        code, out, err = self.t("pro:a.b list")
+        self.assertNotIn("zero", out)
+        self.assertIn("one", out)
+        self.assertNotIn("two", out)
+
+        code, out, err = self.t("pro.not:a list")
+        self.assertIn("zero", out)
+        self.assertIn("one", out)
+        self.assertNotIn("two", out)
+
+        code, out, err = self.t("pro.not:a.b list")
+        self.assertIn("zero", out)
+        self.assertNotIn("one", out)
+        self.assertIn("two", out)
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner