From 39da3d68ca36e78364ca89adf8df8d8d2ba2c748 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 11 Jun 2014 06:33:44 -0400 Subject: [PATCH] Unit Tests - Removed obsolete tests. --- test/confirmation.t | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/test/confirmation.t b/test/confirmation.t index 54e99a1c5..86c8bf409 100755 --- a/test/confirmation.t +++ b/test/confirmation.t @@ -27,17 +27,21 @@ use strict; use warnings; -use Test::More tests => 22; +use Test::More tests => 21; # 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, '>', 'confirm.rc') +if (open my $fh, '>', $rc) { print $fh "data.location=.\n", - "confirmation=yes\n"; + "confirmation=on\n"; close $fh; } @@ -46,58 +50,57 @@ if (open my $fh, '>', 'response.txt') { print $fh "\n\nn\n"; close $fh; - ok (-r 'response.txt', 'Created response.txt'); } -qx{../src/task rc:confirm.rc add foo 2>&1} for 1..10; +qx{../src/task rc:$rc add foo 2>&1} for 1..10; # Test the various forms of "Yes". -my $output = qx{echo "Yes" | ../src/task rc:confirm.rc 1 del 2>&1}; +my $output = qx{echo "Yes" | ../src/task rc:$rc 1 del 2>&1}; like ($output, qr/Permanently delete task 1 'foo'\? \(yes\/no\)/, 'confirmation - Yes works'); unlike ($output, qr/Task not deleted\./, 'confirmation - Yes works'); -$output = qx{echo "ye" | ../src/task rc:confirm.rc 2 del 2>&1}; +$output = qx{echo "ye" | ../src/task rc:$rc 2 del 2>&1}; like ($output, qr/Permanently delete task 2 'foo'\? \(yes\/no\)/, 'confirmation - ye works'); unlike ($output, qr/Task not deleted\./, 'confirmation - ye works'); -$output = qx{echo "y" | ../src/task rc:confirm.rc 3 del 2>&1}; +$output = qx{echo "y" | ../src/task rc:$rc 3 del 2>&1}; like ($output, qr/Permanently delete task 3 'foo'\? \(yes\/no\)/, 'confirmation - y works'); unlike ($output, qr/Task not deleted\./, 'confirmation - y works'); -$output = qx{echo "YES" | ../src/task rc:confirm.rc 4 del 2>&1}; +$output = qx{echo "YES" | ../src/task rc:$rc 4 del 2>&1}; like ($output, qr/Permanently delete task 4 'foo'\? \(yes\/no\)/, 'confirmation - YES works'); unlike ($output, qr/Task not deleted\./, 'confirmation - YES works'); # 10 -$output = qx{echo "YE" | ../src/task rc:confirm.rc 5 del 2>&1}; +$output = qx{echo "YE" | ../src/task rc:$rc 5 del 2>&1}; like ($output, qr/Permanently delete task 5 'foo'\? \(yes\/no\)/, 'confirmation - YE works'); unlike ($output, qr/Task not deleted\./, 'confirmation - YE works'); -$output = qx{echo "Y" | ../src/task rc:confirm.rc 6 del 2>&1}; +$output = qx{echo "Y" | ../src/task rc:$rc 6 del 2>&1}; like ($output, qr/Permanently delete task 6 'foo'\? \(yes\/no\)/, 'confirmation - Y works'); unlike ($output, qr/Task not deleted\./, 'confirmation - Y works'); # Test the various forms of "no". -$output = qx{echo "no" | ../src/task rc:confirm.rc 7 del 2>&1}; +$output = qx{echo "no" | ../src/task rc:$rc 7 del 2>&1}; like ($output, qr/Permanently delete task 7 'foo'\? \(yes\/no\)/, 'confirmation - no works'); like ($output, qr/Task not deleted\./, 'confirmation - no works'); -$output = qx{echo "n" | ../src/task rc:confirm.rc 7 del 2>&1}; +$output = qx{echo "n" | ../src/task rc:$rc 7 del 2>&1}; like ($output, qr/Permanently delete task 7 'foo'\? \(yes\/no\)/, 'confirmation - n works'); like ($output, qr/Task not deleted\./, 'confirmation - n works'); -$output = qx{echo "NO" | ../src/task rc:confirm.rc 7 del 2>&1}; +$output = qx{echo "NO" | ../src/task rc:$rc 7 del 2>&1}; like ($output, qr/Permanently delete task 7 'foo'\? \(yes\/no\)/, 'confirmation - NO works'); like ($output, qr/Task not deleted\./, 'confirmation - NO works'); # 20 -$output = qx{echo "N" | ../src/task rc:confirm.rc 7 del 2>&1}; +$output = qx{echo "N" | ../src/task rc:$rc 7 del 2>&1}; like ($output, qr/Permanently delete task 7 'foo'\? \(yes\/no\)/, 'confirmation - N works'); like ($output, qr/Task not deleted\./, 'confirmation - N works'); # Test newlines. -$output = qx{cat response.txt | ../src/task rc:confirm.rc 7 del 2>&1}; +$output = qx{cat response.txt | ../src/task rc:$rc 7 del 2>&1}; like ($output, qr/(Permanently delete task 7 'foo'\? \(yes\/no\)) \1 \1/, 'confirmation - \n re-prompt works'); # 43 # Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data confirm.rc response.txt); +unlink qw(pending.data completed.data undo.data backlog.data response.txt), $rc; exit 0;