From 8d8f2f1d951d80277e10c27e048121d226311979 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 24 Jun 2015 13:31:38 -0400
Subject: [PATCH] Tests: Relocated tests to eliminate a script

- Relocated (relevant) tests from bug.concat.t to uda_orphan.t, which yields
  better grouping, and allows the deletion of bug.concat.t, which contains
  tests that are no longer relevant.
---
 test/bug.concat.t | 79 -----------------------------------------------
 test/uda_orphan.t | 10 +++++-
 2 files changed, 9 insertions(+), 80 deletions(-)
 delete mode 100755 test/bug.concat.t

diff --git a/test/bug.concat.t b/test/bug.concat.t
deleted file mode 100755
index 1dc4cf14a..000000000
--- a/test/bug.concat.t
+++ /dev/null
@@ -1,79 +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=no\n";
-  close $fh;
-}
-
-# When a task is modified like this:
-#
-#   % task 1 modify This is a new description
-#
-# The arguments are concatenated thus:
-#
-#   Thisisanewdescription
-
-qx{../src/task rc:$rc add This is the original text 2>&1};
-my $output = qx{../src/task rc:$rc info 1 2>&1};
-like ($output, qr/Description\s+This is the original text/, "$ut: original correct");
-
-qx{../src/task rc:$rc 1 modify This is the modified text 2>&1};
-$output = qx{../src/task rc:$rc info 1 2>&1};
-like ($output, qr/Description\s+This is the modified text\n/, "$ut: modified correct");
-
-# When a task is added like this:
-#
-#   % task add aaa bbb:ccc ddd
-#
-# The description is concatenated thus:
-#
-#   aaabbb:ccc ddd
-
-qx{../src/task rc:$rc add aaa bbb:ccc ddd 2>&1};
-$output = qx{../src/task rc:$rc info 2 2>&1};
-like ($output, qr/Description\s+aaa bbb:ccc ddd\n/, "$ut: properly concatenated");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index 108e380e8..e29e8dfd7 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 6;
+use Test::More tests => 9;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -84,6 +84,14 @@ like ($output, qr/Imported 1 tasks\./, 'UDA orphan import');
 $output = qx{../src/task rc:uda.rc 2 info 2>&1};
 like ($output, qr/extra\s+bar/, 'UDA orphan imported and visible');
 
+# Make sure an orphan cannot be created from the command line.
+$output = qx{../src/task rc:uda.rc add three name:value 2>&1};
+like ($output, qr/Created task 3/, 'Task with orphan added, but as description');
+$output = qx{../src/task rc:uda.rc _get 3.name};
+is ($output, "\n", 'name:value not added as <name>:<value>');
+$output = qx{../src/task rc:uda.rc _get 3.description};
+is ($output, "three name:value\n", 'name:value added as description');
+
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data uda.rc import.txt);
 exit 0;