From 23991f72da39f6c7da5131402157cd204f7472cf Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 15 Oct 2011 19:09:32 -0400 Subject: [PATCH] Unit Tests - Removed bulk tests that are obsoleted by those in bulk.t. --- test/confirmation.t | 60 +++++++++++---------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/test/confirmation.t b/test/confirmation.t index d8fa3fe4b..6a33a5d5d 100755 --- a/test/confirmation.t +++ b/test/confirmation.t @@ -28,7 +28,7 @@ use strict; use warnings; -use Test::More tests => 44; +use Test::More tests => 24; # Create the rc file. if (open my $fh, '>', 'confirm.rc') @@ -51,81 +51,49 @@ qx{../src/task rc:confirm.rc add foo} for 1..10; # Test the various forms of "Yes". my $output = qx{echo "-- Yes" | ../src/task rc:confirm.rc 1 del}; -like ($output, qr/Permanently delete task 1 'foo'\? \(y\/n\)/, 'confirmation - Yes works'); +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}; -like ($output, qr/Permanently delete task 2 'foo'\? \(y\/n\)/, 'confirmation - ye works'); +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}; -like ($output, qr/Permanently delete task 3 'foo'\? \(y\/n\)/, 'confirmation - y works'); +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}; -like ($output, qr/Permanently delete task 4 'foo'\? \(y\/n\)/, 'confirmation - YES works'); -unlike ($output, qr/Task not deleted\./, 'confirmation - YES works'); +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}; -like ($output, qr/Permanently delete task 5 'foo'\? \(y\/n\)/, 'confirmation - YE works'); +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}; -like ($output, qr/Permanently delete task 6 'foo'\? \(y\/n\)/, 'confirmation - Y works'); +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}; -like ($output, qr/Permanently delete task 7 'foo'\? \(y\/n\)/, 'confirmation - no works'); +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}; -like ($output, qr/Permanently delete task 7 'foo'\? \(y\/n\)/, 'confirmation - n works'); +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}; -like ($output, qr/Permanently delete task 7 'foo'\? \(y\/n\)/, 'confirmation - NO works'); -like ($output, qr/Task not deleted\./, 'confirmation - NO works'); +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}; -like ($output, qr/Permanently delete task 7 'foo'\? \(y\/n\)/, 'confirmation - N works'); +like ($output, qr/Permanently delete task 7 'foo'\? \(yes\/no\)/, 'confirmation - N works'); like ($output, qr/Task not deleted\./, 'confirmation - N works'); -# Test Yes for multiple changes -$output = qx{echo -e "-- y\nY\nY\nY\nY" | ../src/task rc:confirm.rc 7-10 modify +bar}; -like ($output, qr/Proceed with change\? \(yes\/no\/all\/quit\)/, 'multiple confirmations - Y works'); -like ($output, qr/Task 7 "foo"/, 'multiple confirmations - Y works'); -like ($output, qr/Task 8 "foo"/, 'multiple confirmations - Y works'); -like ($output, qr/Task 9 "foo"/, 'multiple confirmations - Y works'); -like ($output, qr/Task 10 "foo"/, 'multiple confirmations - Y works'); -like ($output, qr/Modified 4 tasks/, 'multiple confirmations - Y works'); - -# Test no for multiple changes -$output = qx{echo -e "-- N\nn\nn\nn\nn" | ../src/task rc:confirm.rc 7-10 modify -bar}; -like ($output, qr/Proceed with change\? \(yes\/no\/all\/quit\)/, 'multiple confirmations - n works'); -like ($output, qr/Task 7 "foo"/, 'multiple confirmations - n works'); -like ($output, qr/Task 8 "foo"/, 'multiple confirmations - n works'); -like ($output, qr/Task 9 "foo"/, 'multiple confirmations - n works'); -like ($output, qr/Task 10 "foo"/, 'multiple confirmations - n works'); -like ($output, qr/Modified 0 tasks/, 'multiple confirmations - n works'); - -# Test All for multiple changes -$output = qx{echo -e "-- a\nA" | ../src/task rc:confirm.rc 7-10 modify -bar}; -like ($output, qr/Proceed with change\? \(yes\/no\/all\/quit\)/, 'multiple confirmations - A works'); -like ($output, qr/Task 7 "foo"/, 'multiple confirmations - A works'); -unlike ($output, qr/Task 8 "foo"/, 'multiple confirmations - A works'); -like ($output, qr/Modified 4 tasks/, 'multiple confirmations - A works'); - -# Test quit for multiple changes -$output = qx{echo "-- q" | ../src/task rc:confirm.rc 7-10 modify +bar}; -like ($output, qr/Proceed with change\? \(yes\/no\/all\/quit\)/, 'multiple confirmations - q works'); -like ($output, qr/Task 7 "foo"/, 'multiple confirmations - q works'); -unlike ($output, qr/Task 8 "foo"/, 'multiple confirmations - q works'); -like ($output, qr/Modified 0 tasks/, 'multiple confirmations - q works'); - # Test newlines. $output = qx{cat response.txt | ../src/task rc:confirm.rc 7 del}; -like ($output, qr/(Permanently delete task 7 'foo'\? \(y\/n\)) \1 \1/, 'confirmation - \n re-prompt works'); +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 synch.key confirm.rc response.txt);