From 99ff110904a5ab30eb0378aeb8b3319aa823107f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 12 Jul 2015 15:26:20 -0400
Subject: [PATCH] Test: Merged bug.972.t into recur.t

---
 test/bug.972.t | 56 --------------------------------------------------
 test/recur.t   |  7 ++++++-
 2 files changed, 6 insertions(+), 57 deletions(-)
 delete mode 100755 test/bug.972.t

diff --git a/test/bug.972.t b/test/bug.972.t
deleted file mode 100755
index 25e44a0a9..000000000
--- a/test/bug.972.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=off\n";
-  close $fh;
-}
-
-# Bug 972: A recurrence period of "7" is interpreted as "7s", not "7d" as
-# intended.
-my $output = qx{../src/task rc:$rc add foo due:now recur:2 2>&1};
-like ($output, qr/The duration value '2' is not supported./, "$ut: recur:2 is not valid");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/recur.t b/test/recur.t
index 9b6344882..c2f005ffc 100755
--- a/test/recur.t
+++ b/test/recur.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 9;
+use Test::More tests => 10;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -92,6 +92,11 @@ like ($output, qr/Deleted 1 task\./, '3 deleted');
 $output = qx{../src/task rc:recur.rc diag 2>&1};
 like ($output, qr/No duplicates found/, 'No duplicate UUIDs detected');
 
+# Bug 972: A recurrence period of "7" is interpreted as "7s", not "7d" as
+# intended.
+$output = qx{../src/task rc:recur.rc add foo due:now recur:2 2>&1};
+like ($output, qr/The duration value '2' is not supported./, "'recur:2' is not valid");
+
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data recur.rc);
 exit 0;