From 13ce276b8c6254dbfb95d3cf4d374ce17086bd2c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 23 Jul 2015 07:51:41 -0400
Subject: [PATCH] Test: Merged bug.recur.t into recurrence.t

---
 test/bug.recur.t  | 56 -----------------------------------------------
 test/recurrence.t | 10 +++++++++
 2 files changed, 10 insertions(+), 56 deletions(-)
 delete mode 100755 test/bug.recur.t

diff --git a/test/bug.recur.t b/test/bug.recur.t
deleted file mode 100755
index 60532d497..000000000
--- a/test/bug.recur.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 => 1;
-
-# 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=no\n";
-  close $fh;
-}
-
-# Add a recurring task with no due date, look for expected error.
-qx{../src/task rc:$rc add foo recur:daily 2>&1};
-my $output = qx{../src/task rc:$rc info 1 2>&1};
-unlike ($output, qr/Description\s+foo/, "$ut: task not created - missing due date");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/recurrence.t b/test/recurrence.t
index 90658ad20..a0b49f8fd 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -264,6 +264,16 @@ class TestAppendPrependRecurrence(TestCase):
         code, out, err = self.t("2 prepend PRE", input="y\n")
         self.assertIn("Prepended 2 tasks.", out)
 
+class TestNoDueDate(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_no_due_date(self):
+        """Look for an error when adding a recurring task with no due date"""
+        code, out, err = self.t.runError("add foo recur:daily")
+        self.assertIn("A recurring task must also have a 'due' date.", err)
+
 
 # TODO Wait a recurring task
 # TODO Upgrade a task to a recurring task