From f74e0d88e49a1909babf540ef838b1c25d36c783 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 12 Jul 2015 14:54:38 -0400
Subject: [PATCH] =?UTF-8?q?Test:=20Merged=20bug.991.t=20and=20config.obsol?=
 =?UTF-8?q?ete.t=20into=20conf=D1=96guration.t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/bug.991.t                              | 60 ---------------------
 test/{config.obsolete.t => configuration.t} | 15 ++++--
 2 files changed, 12 insertions(+), 63 deletions(-)
 delete mode 100755 test/bug.991.t
 rename test/{config.obsolete.t => configuration.t} (78%)

diff --git a/test/bug.991.t b/test/bug.991.t
deleted file mode 100755
index 0bec05601..000000000
--- a/test/bug.991.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 => 3;
-
-# 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 991 - A deprecated configuration variable is checked
-# - showing the list of default configuration variables
-# - checking that there is no error, no deprecated variable and no unrecognized variables
-
-qx{../src/task rc:$rc add foo 2>&1};
-my $output = qx{../src/task rc:$rc show 2>&1};
-like   ($output, qr/^Config Variable\s+Value$/m, "$ut: Variables shown");
-unlike ($output, qr/Configuration error/ms,      "$ut: No configuration error");
-unlike ($output, qr/unrecognized/ms,             "$ut: No unrecognized variable");
-
-## Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
diff --git a/test/config.obsolete.t b/test/configuration.t
similarity index 78%
rename from test/config.obsolete.t
rename to test/configuration.t
index 74a5ea076..e939ebdd2 100755
--- a/test/config.obsolete.t
+++ b/test/configuration.t
@@ -35,17 +35,26 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 from basetest import Task, TestCase
 
 
-class TestObsoleteConfig(TestCase):
+class TestConfiguration(TestCase):
 
     def setUp(self):
         """Executed before each test in the class"""
         self.t = Task()
 
-    def test_show_obsolete_config(self):
+    def test_default_config(self):
+        """Verify that by default, the 'show' command has no complaints"""
+        code, out, err = self.t("show")
+        self.assertNotIn("Configuration error:", out)
+        self.assertNotIn("unrecognized variables", out)
+        self.assertNotIn("unrecognized value", out)
+        self.assertNotIn("data.location not specified", out)
+        self.assertNotIn("data.location contains", out)
+
+    def test_obsolete_config(self):
         """Verify that the 'show' command detects obsolete configuration"""
         self.t.config("foo", "1")
         code, out, err = self.t("show")
-        self.assertIn("Your .taskrc file contains these unrecognized variables", out)
+        self.assertIn("unrecognized variables", out)
         self.assertIn("  foo\n", out)