From 4164c8184bad2564f5fcf0829b3370f9b0834411 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc+taskw@gmail.com>
Date: Wed, 24 Jun 2015 18:09:02 +0100
Subject: [PATCH] Tests: bug.489 merged with filter.t

---
 test/bug.489.t | 56 --------------------------------------------------
 test/filter.t  | 15 ++++++++++++++
 2 files changed, 15 insertions(+), 56 deletions(-)
 delete mode 100755 test/bug.489.t

diff --git a/test/bug.489.t b/test/bug.489.t
deleted file mode 100755
index 56d1cf462..000000000
--- a/test/bug.489.t
+++ /dev/null
@@ -1,56 +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 => 2;
-
-# 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 #489 - tags.none: is not filtering tagless tasks
-qx{../src/task rc:$rc add with +tag 2>&1};
-qx{../src/task rc:$rc add without 2>&1};
-my $output = qx{../src/task rc:$rc list tags.none: 2>&1};
-unlike ($output, qr/with /,   "$ut: tags.none: skips tagged");
-like   ($output, qr/without/, "$ut: tags.none: finds tagless");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
diff --git a/test/filter.t b/test/filter.t
index a79a07474..651f1c144 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -533,6 +533,21 @@ class TestBug485(TestCase):
         self.assertIn("two", out)
 
 
+class TestBug489(TestCase):
+    @classmethod
+    def setUp(cls):
+        cls.t = Task()
+
+    def test_filter_tagless_tasks(self):
+        """tags.none: filters tagless tasks"""
+        self.t(("add", "with", "+tag"))
+        self.t(("add", "without"))
+
+        code, out, err = self.t(("list", "tags.none:"))
+        self.assertNotIn("with ", out)
+        self.assertIn("without", out)
+
+
 @unittest.skip("WaitingFor TW-1600")
 class TestBug1600(TestCase):
     def setUp(self):