From 57ef35441d1b4910e76c7a010f543d294a6c4e60 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Thu, 5 Nov 2009 21:37:47 +0100 Subject: [PATCH] Fixed bug in regexp matching of whitespace between month and year. --- src/tests/cal.t | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/cal.t b/src/tests/cal.t index 1d0f0b176..78b081ec2 100755 --- a/src/tests/cal.t +++ b/src/tests/cal.t @@ -58,18 +58,18 @@ if ( $day <= 9) # task cal and task cal y my $output = qx{../task rc:cal.rc rc._forcecolor:on cal}; like ($output, qr/\[36m$day/, 'Current day is highlighted'); -like ($output, qr/$month.* $year/, 'Current month and year are displayed'); +like ($output, qr/$month\w+?\s+?$year/, 'Current month and year are displayed'); qx{../task rc:cal.rc add zero}; unlike ($output, qr/\[41m\d+/, 'No overdue tasks are present'); unlike ($output, qr/\[43m\d+/, 'No due tasks are present'); $output = qx{../task rc:cal.rc rc.weekstart:Sunday cal}; -like ($output, qr/Su Mo Tu/, 'Week starts on Sunday'); +like ($output, qr/Su Mo Tu/, 'Week starts on Sunday'); $output = qx{../task rc:cal.rc rc.weekstart:Monday cal}; -like ($output, qr/Fr Sa Su/, 'Week starts on Monday'); +like ($output, qr/Fr Sa Su/, 'Week starts on Monday'); $output = qx{../task rc:cal.rc cal y}; -like ($output, qr/$month.* $year/, 'Current month and year are displayed'); -like ($output, qr/$prevmonth.* $nextyear/, 'Month and year one year ahead are displayed'); -unlike ($output, qr/$month.* $nextyear/, 'Current month and year ahead are not displayed'); +like ($output, qr/$month\w+?\s+?$year/, 'Current month and year are displayed'); +like ($output, qr/$prevmonth\w+?\s+?$nextyear/, 'Month and year one year ahead are displayed'); +unlike ($output, qr/$month\w+?\s+?$nextyear/, 'Current month and year ahead are not displayed'); # task cal due and task cal due y qx{../task rc:cal.rc add due:20190515 one};