From 1e31df3c7ae9c812c5b14a32086bb35a9bfa4ca0 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc+taskw@gmail.com>
Date: Tue, 5 May 2015 15:13:01 +0100
Subject: [PATCH] Tests: bug.368.t > feature.recurrence.t as python

---
 test/bug.368.t            | 60 ---------------------------------------
 test/feature.recurrence.t | 15 +++++++++-
 2 files changed, 14 insertions(+), 61 deletions(-)
 delete mode 100755 test/bug.368.t

diff --git a/test/bug.368.t b/test/bug.368.t
deleted file mode 100755
index cefb410f7..000000000
--- a/test/bug.368.t
+++ /dev/null
@@ -1,60 +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",
-            "dateformat.info=m/d/Y\n",
-            "confirmation=no\n";
-  close $fh;
-}
-
-# Setup: Add a recurring task, generate an instance, then add a project.
-qx{../src/task rc:$rc add foo due:today recur:daily until:eom 2>&1};
-my $output = qx{../src/task rc:$rc info 1 2>&1};
-
-# Result: Make sure the 'until' date is rendered as a date, not an epoch.
-unlike ($output, qr/Until\s+\d{10}/,          "$ut: until is not shown as an epoch");
-  like ($output, qr/Until\s+\d+\/\d+\/\d{4}/, "$ut: until is shown as a date");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index 52ab85fa0..96363c134 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -34,12 +34,13 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 from basetest import Task, TestCase
 
 
-class TestBug327(TestCase):
+class TestRecurrenceProblems(TestCase):
     def setUp(self):
         self.t = Task()
 
     def test_recurring_due_removal(self):
         """Removing due from a recurring task causes date wrapping"""
+        # Originally bug.327.t
 
         self.t(("add", "foo", "recur:yearly", "due:eoy"))
         self.t(("list",))  # Trigger garbage collection
@@ -52,6 +53,18 @@ class TestBug327(TestCase):
         self.assertIn("\n1 task", out)
         self.assertNotIn("1969", out)
 
+    def test_recurring_not_as_epoch(self):
+        """Ensure 'until' is rendered as date, not epoch"""
+        # Originally bug.368.t
+
+        self.t.config("dateformat.info", "m/d/Y")
+
+        self.t(("add", "foo", "due:today", "recur:yearly", "until:eom"))
+        code, out, err = self.t(("info", "1"))
+
+        self.assertNotRegexpMatches(out, "Until\s+\d{10}")
+        self.assertRegexpMatches(out, "Until\s+\d+\/\d+\/\d{4}")
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner