From 7e04e307c340938abfe523336239e752dcfe304b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 23 Aug 2014 17:13:06 -0400
Subject: [PATCH] Unit Tests

- Updated op_or.t to the current template.
---
 test/op_or.t | 56 ++++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/test/op_or.t b/test/op_or.t
index 0b71b7edf..b9218b7dd 100755
--- a/test/op_or.t
+++ b/test/op_or.t
@@ -33,8 +33,12 @@ use Test::More tests => 16;
 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, '>', 'op.rc')
+if (open my $fh, '>', $rc)
 {
   print $fh "data.location=.\n",
             "confirmation=no\n";
@@ -42,37 +46,37 @@ if (open my $fh, '>', 'op.rc')
 }
 
 # Setup: Add a task
-qx{../src/task rc:op.rc add one   project:A priority:H 2>&1};
-qx{../src/task rc:op.rc add two   project:A            2>&1};
-qx{../src/task rc:op.rc add three           priority:H 2>&1};
-qx{../src/task rc:op.rc add four                       2>&1};
+qx{../src/task rc:$rc add one   project:A priority:H 2>&1};
+qx{../src/task rc:$rc add two   project:A            2>&1};
+qx{../src/task rc:$rc add three           priority:H 2>&1};
+qx{../src/task rc:$rc add four                       2>&1};
 
 # Test the 'or' operator.
-my $output = qx{../src/task rc:op.rc ls project:A or priority:H 2>&1};
-like   ($output, qr/one/,   'ls project:A or priority:H --> one');
-like   ($output, qr/two/,   'ls project:A or priority:H --> two');
-like   ($output, qr/three/, 'ls project:A or priority:H --> three');
-unlike ($output, qr/four/,  'ls project:A or priority:H --> !four');
+my $output = qx{../src/task rc:$rc ls project:A or priority:H 2>&1};
+like   ($output, qr/one/,   "$ut: ls project:A or priority:H --> one");
+like   ($output, qr/two/,   "$ut: ls project:A or priority:H --> two");
+like   ($output, qr/three/, "$ut: ls project:A or priority:H --> three");
+unlike ($output, qr/four/,  "$ut: ls project:A or priority:H --> !four");
 
-$output = qx{../src/task rc:op.rc ls project:A or priority=H 2>&1};
-like   ($output, qr/one/,   'ls project:A or priority=H --> one');
-like   ($output, qr/two/,   'ls project:A or priority=H --> two');
-like   ($output, qr/three/, 'ls project:A or priority=H --> three');
-unlike ($output, qr/four/,  'ls project:A or priority=H --> !four');
+$output = qx{../src/task rc:$rc ls project:A or priority=H 2>&1};
+like   ($output, qr/one/,   "$ut: ls project:A or priority=H --> one");
+like   ($output, qr/two/,   "$ut: ls project:A or priority=H --> two");
+like   ($output, qr/three/, "$ut: ls project:A or priority=H --> three");
+unlike ($output, qr/four/,  "$ut: ls project:A or priority=H --> !four");
 
-$output = qx{../src/task rc:op.rc ls project=A or priority:H 2>&1};
-like   ($output, qr/one/,   'ls project=A or priority:H --> one');
-like   ($output, qr/two/,   'ls project=A or priority:H --> two');
-like   ($output, qr/three/, 'ls project=A or priority:H --> three');
-unlike ($output, qr/four/,  'ls project=A or priority:H --> !four');
+$output = qx{../src/task rc:$rc ls project=A or priority:H 2>&1};
+like   ($output, qr/one/,   "$ut: ls project=A or priority:H --> one");
+like   ($output, qr/two/,   "$ut: ls project=A or priority:H --> two");
+like   ($output, qr/three/, "$ut: ls project=A or priority:H --> three");
+unlike ($output, qr/four/,  "$ut: ls project=A or priority:H --> !four");
 
-$output = qx{../src/task rc:op.rc ls project=A or priority=H 2>&1};
-like   ($output, qr/one/,   'ls project=A or priority=H --> one');
-like   ($output, qr/two/,   'ls project=A or priority=H --> two');
-like   ($output, qr/three/, 'ls project=A or priority=H --> three');
-unlike ($output, qr/four/,  'ls project=A or priority=H --> !four');
+$output = qx{../src/task rc:$rc ls project=A or priority=H 2>&1};
+like   ($output, qr/one/,   "$ut: ls project=A or priority=H --> one");
+like   ($output, qr/two/,   "$ut: ls project=A or priority=H --> two");
+like   ($output, qr/three/, "$ut: ls project=A or priority=H --> three");
+unlike ($output, qr/four/,  "$ut: ls project=A or priority=H --> !four");
 
 # Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data op.rc);
+unlink qw(pending.data completed.data undo.data backlog.data), $rc;
 exit 0;