From 2c4480dc1bf08890afffb4d2a5b5c90866de81a1 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc+taskw@gmail.com>
Date: Thu, 11 Jun 2015 23:42:46 +0100
Subject: [PATCH] Tests: bug.485 merged with filter.t

---
 test/bug.485.t | 61 --------------------------------------------------
 test/filter.t  | 23 +++++++++++++++++++
 2 files changed, 23 insertions(+), 61 deletions(-)
 delete mode 100755 test/bug.485.t

diff --git a/test/bug.485.t b/test/bug.485.t
deleted file mode 100755
index 6523b2dec..000000000
--- a/test/bug.485.t
+++ /dev/null
@@ -1,61 +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",
-            "verbose=nothing\n";
-  close $fh;
-}
-
-# Bug #485 - 'task list recur:month' doesn't list monthly tasks
-qx{../src/task rc:$rc add one due:tomorrow recur:monthly};
-qx{../src/task rc:$rc add two due:tomorrow recur:1month};
-my $output = qx{../src/task rc:$rc list recur:monthly};
-like ($output, qr/one/, 'monthly -> monthly');
-like ($output, qr/two/, '1month  -> monthly');
-
-$output = qx{../src/task rc:$rc list recur:1month};
-like ($output, qr/one/, 'monthly -> monthly');
-like ($output, qr/two/, '1month  -> monthly');
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data), $rc;
-exit 0;
diff --git a/test/filter.t b/test/filter.t
index 974bd50ee..a79a07474 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -510,6 +510,29 @@ class TestBug480B(TestCase):
         self.assertNotIn("three", out)
 
 
+class TestBug485(TestCase):
+    @classmethod
+    def setUp(cls):
+        cls.t = Task()
+
+        cls.t.config("verbose", "nothing")
+
+        cls.t(("add", "one", "due:tomorrow", "recur:monthly"))
+        cls.t(("add", "two", "due:tomorrow", "recur:1month"))
+
+    def test_filter_recur_monthly(self):
+        """filter 'recur:monthly' doesn't list monthly tasks"""
+        code, out, err = self.t(("list", "recur:monthly"))
+        self.assertIn("one", out)
+        self.assertIn("two", out)
+
+    def test_filter_recur_1month(self):
+        """filter 'recur:1month' doesn't list monthly tasks"""
+        code, out, err = self.t(("list", "recur:1month"))
+        self.assertIn("one", out)
+        self.assertIn("two", out)
+
+
 @unittest.skip("WaitingFor TW-1600")
 class TestBug1600(TestCase):
     def setUp(self):