From a078ad41e858a15c9c46c966c5cf77c2bc249c7d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 1 Nov 2014 21:53:58 -0400
Subject: [PATCH] Task

- Removed unnecessary include.
---
 src/Task.cpp  |  1 -
 test/args.2.t | 48 ++++++++++++++++++++++++++----------------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index a579b1c0f..d51f88661 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -35,7 +35,6 @@
 #ifdef PRODUCT_TASKWARRIOR
 #include <Context.h>
 #include <Nibbler.h>
-#include <Tree.h>
 #endif
 #include <Date.h>
 #include <Duration.h>
diff --git a/test/args.2.t b/test/args.2.t
index fb35b4bd9..f02de668b 100755
--- a/test/args.2.t
+++ b/test/args.2.t
@@ -33,8 +33,12 @@ use Test::More tests => 5;
 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, '>', 'args.rc')
+if (open my $fh, '>', $rc)
 {
   print $fh "data.location=.\n",
             "confirmation=off\n";
@@ -42,33 +46,33 @@ if (open my $fh, '>', 'args.rc')
 }
 
 # Test 'done' with en-passant changes.
-qx{../src/task rc:args.rc add one 2>&1};
-qx{../src/task rc:args.rc add two 2>&1};
-qx{../src/task rc:args.rc add three 2>&1};
-qx{../src/task rc:args.rc add four 2>&1};
-qx{../src/task rc:args.rc add five 2>&1};
+qx{../src/task rc:$rc add one 2>&1};
+qx{../src/task rc:$rc add two 2>&1};
+qx{../src/task rc:$rc add three 2>&1};
+qx{../src/task rc:$rc add four 2>&1};
+qx{../src/task rc:$rc add five 2>&1};
 
-qx{../src/task rc:args.rc 1 done oneanno 2>&1};
-my $output = qx{../src/task rc:args.rc 1 info 2>&1};
-like ($output, qr/oneanno/, 'done enpassant anno');
+qx{../src/task rc:$rc 1 done oneanno 2>&1};
+my $output = qx{../src/task rc:$rc 1 info 2>&1};
+like ($output, qr/oneanno/, "$ut: done enpassant anno");
 
-qx{../src/task rc:args.rc 2 done /two/TWO/ 2>&1};
-$output = qx{../src/task rc:args.rc 2 info 2>&1};
-like ($output, qr/Description\s+TWO/, 'done enpassant subst');
+qx{../src/task rc:$rc 2 done /two/TWO/ 2>&1};
+$output = qx{../src/task rc:$rc 2 info 2>&1};
+like ($output, qr/Description\s+TWO/, "$ut: done enpassant subst");
 
-qx{../src/task rc:args.rc 3 done +threetag 2>&1};
-$output = qx{../src/task rc:args.rc 3 info 2>&1};
-like ($output, qr/Tags\s+threetag/, 'done enpassant tag');
+qx{../src/task rc:$rc 3 done +threetag 2>&1};
+$output = qx{../src/task rc:$rc 3 info 2>&1};
+like ($output, qr/Tags\s+threetag/, "$ut: done enpassant tag");
 
-qx{../src/task rc:args.rc 4 done pri:H 2>&1};
-$output = qx{../src/task rc:args.rc 4 info 2>&1};
-like ($output, qr/Priority\s+H/, 'done enpassant priority');
+qx{../src/task rc:$rc 4 done pri:H 2>&1};
+$output = qx{../src/task rc:$rc 4 info 2>&1};
+like ($output, qr/Priority\s+H/, "$ut: done enpassant priority");
 
-qx{../src/task rc:args.rc 5 done pro:A 2>&1};
-$output = qx{../src/task rc:args.rc 5 info 2>&1};
-like ($output, qr/Project\s+A/, 'done enpassant project');
+qx{../src/task rc:$rc 5 done pro:A 2>&1};
+$output = qx{../src/task rc:$rc 5 info 2>&1};
+like ($output, qr/Project\s+A/, "$ut: done enpassant project");
 
 # Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data args.rc);
+unlink qw(pending.data completed.data undo.data backlog.data), $rc;
 exit 0;