From 7512dd21aa407359a2999d5b0e554c2e614cf81c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 11 Jun 2014 06:20:36 -0400
Subject: [PATCH] Unit Tests

- Removed obsolete test.
---
 test/filter-prefix.t | 47 +++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/test/filter-prefix.t b/test/filter-prefix.t
index 4d4fbac34..b9dc38621 100755
--- a/test/filter-prefix.t
+++ b/test/filter-prefix.t
@@ -27,31 +27,34 @@
 
 use strict;
 use warnings;
-use Test::More tests => 58;
+use Test::More tests => 56;
 
 # 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, '>', 'filter.rc')
+if (open my $fh, '>', $rc)
 {
   print $fh "data.location=.\n";
   close $fh;
-  ok (-r 'filter.rc', 'Created filter.rc');
 }
 
 # Test the filters.
-qx{../src/task rc:filter.rc add project:foo.uno priority:H +tag one foo 2>&1};
-qx{../src/task rc:filter.rc add project:foo.dos priority:H      two 2>&1};
-qx{../src/task rc:filter.rc add project:foo.tres                three 2>&1};
-qx{../src/task rc:filter.rc add project:bar.uno priority:H      four 2>&1};
-qx{../src/task rc:filter.rc add project:bar.dos            +tag five 2>&1};
-qx{../src/task rc:filter.rc add project:bar.tres                six foo 2>&1};
-qx{../src/task rc:filter.rc add project:bazuno                  seven bar foo 2>&1};
-qx{../src/task rc:filter.rc add project:bazdos                  eight bar foo 2>&1};
+qx{../src/task rc:$rc add project:foo.uno priority:H +tag one foo 2>&1};
+qx{../src/task rc:$rc add project:foo.dos priority:H      two 2>&1};
+qx{../src/task rc:$rc add project:foo.tres                three 2>&1};
+qx{../src/task rc:$rc add project:bar.uno priority:H      four 2>&1};
+qx{../src/task rc:$rc add project:bar.dos            +tag five 2>&1};
+qx{../src/task rc:$rc add project:bar.tres                six foo 2>&1};
+qx{../src/task rc:$rc add project:bazuno                  seven bar foo 2>&1};
+qx{../src/task rc:$rc add project:bazdos                  eight bar foo 2>&1};
 
-my $output = qx{../src/task rc:filter.rc list 2>&1};
+my $output = qx{../src/task rc:$rc list 2>&1};
 like   ($output, qr/one/,   'a1');
 like   ($output, qr/two/,   'a2');
 like   ($output, qr/three/, 'a3');
@@ -61,7 +64,7 @@ like   ($output, qr/six/,   'a6');
 like   ($output, qr/seven/, 'a7');
 like   ($output, qr/eight/, 'a8');
 
-$output = qx{../src/task rc:filter.rc list project:foo 2>&1};
+$output = qx{../src/task rc:$rc list project:foo 2>&1};
 like   ($output, qr/one/,   'b1');
 like   ($output, qr/two/,   'b2');
 like   ($output, qr/three/, 'b3');
@@ -71,7 +74,7 @@ unlike ($output, qr/six/,   'b6');
 unlike ($output, qr/seven/, 'b7');
 unlike ($output, qr/eight/, 'b8');
 
-$output = qx{../src/task rc:filter.rc list project.not:foo 2>&1};
+$output = qx{../src/task rc:$rc list project.not:foo 2>&1};
 unlike ($output, qr/one/,   'c1');
 unlike ($output, qr/two/,   'c2');
 unlike ($output, qr/three/, 'c3');
@@ -81,7 +84,7 @@ like   ($output, qr/six/,   'c6');
 like   ($output, qr/seven/, 'c7');
 like   ($output, qr/eight/, 'c8');
 
-$output = qx{../src/task rc:filter.rc list project.startswith:bar 2>&1};
+$output = qx{../src/task rc:$rc list project.startswith:bar 2>&1};
 unlike ($output, qr/one/,   'd1');
 unlike ($output, qr/two/,   'd2');
 unlike ($output, qr/three/, 'd3');
@@ -91,7 +94,7 @@ like   ($output, qr/six/,   'd6');
 unlike ($output, qr/seven/, 'd7');
 unlike ($output, qr/eight/, 'd8');
 
-$output = qx{../src/task rc:filter.rc list project:ba 2>&1};
+$output = qx{../src/task rc:$rc list project:ba 2>&1};
 unlike ($output, qr/one/,   'f1');
 unlike ($output, qr/two/,   'f2');
 unlike ($output, qr/three/, 'f3');
@@ -101,7 +104,7 @@ like   ($output, qr/six/,   'f6');
 like   ($output, qr/seven/, 'f7');
 like   ($output, qr/eight/, 'f8');
 
-$output = qx{../src/task rc:filter.rc list project.not:ba 2>&1};
+$output = qx{../src/task rc:$rc list project.not:ba 2>&1};
 like   ($output, qr/one/,   'g1');
 like   ($output, qr/two/,   'g2');
 like   ($output, qr/three/, 'g3');
@@ -111,7 +114,7 @@ unlike ($output, qr/six/,   'g6');
 unlike ($output, qr/seven/, 'g7');
 unlike ($output, qr/eight/, 'g8');
 
-$output = qx{../src/task rc:filter.rc list description.has:foo 2>&1};
+$output = qx{../src/task rc:$rc list description.has:foo 2>&1};
 like   ($output, qr/one/,   'i1');
 unlike ($output, qr/two/,   'i2');
 unlike ($output, qr/three/, 'i3');
@@ -122,12 +125,6 @@ like   ($output, qr/seven/, 'i7');
 like   ($output, qr/eight/, 'i8');
 
 # Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data filter.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'filter.rc', 'Cleanup');
-
+unlink qw(pending.data completed.data undo.data backlog.data), $rc;
 exit 0;