Code Cleanup

- More specific test (checking message either in the standard output or the
  standard error).
This commit is contained in:
Louis-Claude Canon
2012-06-16 17:20:54 +02:00
committed by Paul Beckingham
parent e5fe704f6a
commit 1e632fea66
5 changed files with 33 additions and 33 deletions

View File

@@ -42,65 +42,65 @@ if (open my $fh, '>', 'cal.rc')
# Bug: The 'cal' command can fail when provided with challenging arguments.
# Should not fail (because they are correct):
my $output = qx{../src/task rc:cal.rc cal 2>&1};
my $output = qx{../src/task rc:cal.rc cal 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal');
# y due 2010 donkey 8
$output = qx{../src/task rc:cal.rc cal y 2>&1};
$output = qx{../src/task rc:cal.rc cal y 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y');
$output = qx{../src/task rc:cal.rc cal 8 2>&1};
$output = qx{../src/task rc:cal.rc cal 8 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8');
$output = qx{../src/task rc:cal.rc cal due 2>&1};
$output = qx{../src/task rc:cal.rc cal due 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due');
$output = qx{../src/task rc:cal.rc cal 2010 2>&1};
$output = qx{../src/task rc:cal.rc cal 2010 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 2010');
$output = qx{../src/task rc:cal.rc cal donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal donkey');
# y due 2010 donkey 8
$output = qx{../src/task rc:cal.rc cal y due 2>&1};
$output = qx{../src/task rc:cal.rc cal y due 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y due');
$output = qx{../src/task rc:cal.rc cal y 8 2>&1};
$output = qx{../src/task rc:cal.rc cal y 8 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 8');
$output = qx{../src/task rc:cal.rc cal y 2010 2>&1};
$output = qx{../src/task rc:cal.rc cal y 2010 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 2010');
$output = qx{../src/task rc:cal.rc cal y donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal y donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y donkey');
$output = qx{../src/task rc:cal.rc cal 8 due 2>&1};
$output = qx{../src/task rc:cal.rc cal 8 due 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 due');
$output = qx{../src/task rc:cal.rc cal 8 2010 2>&1};
$output = qx{../src/task rc:cal.rc cal 8 2010 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 2010');
$output = qx{../src/task rc:cal.rc cal 8 donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal 8 donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 donkey');
$output = qx{../src/task rc:cal.rc cal due 2010 2>&1};
$output = qx{../src/task rc:cal.rc cal due 2010 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due 2010');
$output = qx{../src/task rc:cal.rc cal due donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal due donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due donkey');
$output = qx{../src/task rc:cal.rc cal 2010 donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal 2010 donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 2010 donkey');
# y 8 due 2010 donkey
$output = qx{../src/task rc:cal.rc cal y 8 due 2>&1};
$output = qx{../src/task rc:cal.rc cal y 8 due 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 8 due');
$output = qx{../src/task rc:cal.rc cal y 8 2010 2>&1};
$output = qx{../src/task rc:cal.rc cal y 8 2010 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 8 2010');
$output = qx{../src/task rc:cal.rc cal y 8 donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal y 8 donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 8 donkey');
$output = qx{../src/task rc:cal.rc cal y due 2010 2>&1};
$output = qx{../src/task rc:cal.rc cal y due 2010 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y due 2010');
$output = qx{../src/task rc:cal.rc cal y due donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal y due donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y due donkey');
$output = qx{../src/task rc:cal.rc cal y 2010 donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal y 2010 donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 2010 donkey');
$output = qx{../src/task rc:cal.rc cal 8 due 2010 2>&1};
$output = qx{../src/task rc:cal.rc cal 8 due 2010 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 due 2010');
$output = qx{../src/task rc:cal.rc cal 8 due donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal 8 due donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 due donkey');
$output = qx{../src/task rc:cal.rc cal 8 2010 donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal 8 2010 donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 2010 donkey');
$output = qx{../src/task rc:cal.rc cal due 2010 8 2>&1};
$output = qx{../src/task rc:cal.rc cal due 2010 8 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due 2010 8');
$output = qx{../src/task rc:cal.rc cal due 2010 donkey 2>&1};
$output = qx{../src/task rc:cal.rc cal due 2010 donkey 2>&1 >/dev/null};
unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due 2010 donkey');
# Cleanup.

View File

@@ -43,7 +43,7 @@ if (open my $fh, '>', 'custom.rc')
}
# Generate the usage screen, and locate the custom report on it.
my $output = qx{../src/task rc:custom.rc foo 2>&1};
my $output = qx{../src/task rc:custom.rc foo 2>&1 >/dev/null};
like ($output, qr/Unrecognized column name 'foo'\.\n/, 'custom report spotted invalid column');
# Cleanup.

View File

@@ -47,7 +47,7 @@ qx{../src/task rc:pri.rc add one pri:H};
qx{../src/task rc:pri.rc add two pri:M};
qx{../src/task rc:pri.rc add three pri:L};
my $output = qx{../src/task rc:pri.rc foo 2>&1};
my $output = qx{../src/task rc:pri.rc foo};
like ($output, qr/ID.+Pri/, 'priority.long indicator heading');
like ($output, qr/1\s+High/, 'priority.long High');
like ($output, qr/2\s+Medium/, 'priority.long Medium');

View File

@@ -45,12 +45,12 @@ if (open my $fh, '>', 'custom.rc')
# Add a recurring and non-recurring task, look for the indicator.
qx{../src/task rc:custom.rc add foo due:tomorrow recur:weekly};
qx{../src/task rc:custom.rc add bar};
my $output = qx{../src/task rc:custom.rc foo 2>&1};
my $output = qx{../src/task rc:custom.rc foo};
like ($output, qr/ID.+R/, 'Recurrence indicator heading');
like ($output, qr/3\s+R/, 'Recurrence indicator t1');
unlike ($output, qr/2\s+R/, 'No recurrence indicator t2');
$output = qx{../src/task rc:custom.rc foo rc.recurrence.indicator=RE 2>&1};
$output = qx{../src/task rc:custom.rc foo rc.recurrence.indicator=RE};
like ($output, qr/3\s+RE/, 'Custom recurrence indicator t1');
unlike ($output, qr/2\s+RE/, 'No custom recurrence indicator t2');

View File

@@ -45,12 +45,12 @@ if (open my $fh, '>', 'custom.rc')
# Generate the usage screen, and locate the custom report on it.
qx{../src/task rc:custom.rc add foo +tag};
qx{../src/task rc:custom.rc add bar};
my $output = qx{../src/task rc:custom.rc foo 2>&1};
my $output = qx{../src/task rc:custom.rc foo};
like ($output, qr/ID.+T/, 'Tag indicator heading');
like ($output, qr/1\s+\+/, 'Tag indicator t1');
unlike ($output, qr/2\s+\+/, 'No tag indicator t2');
$output = qx{../src/task rc:custom.rc foo rc.tag.indicator=TAG 2>&1};
$output = qx{../src/task rc:custom.rc foo rc.tag.indicator=TAG};
like ($output, qr/1\s+TAG/, 'Custom ag indicator t1');
unlike ($output, qr/2\s+TAG/, 'No custom tag indicator t2');