1a34a29b7a
- Fixed bug #438, correcting the sorting of the entry_time, start_time and end_time columns (thanks to Michelle Crane). - Reordered ChangeLog so that bugs, features are in sequence. Don't know why I did this. Some inner compulsion. - Deprecated silly start_time, end_time and entry_time columns, which are now (and were) superseded by start, end and entry columns with time formats. - Config.cpp now detects use of these deprecated fields and complains to the show command. - Date.cpp now uses the variable 'input' instead of 'mdy', which was confusing and implied that it contained a date without a time. - Obsoleted and removed Date::toStringWithTime, which ignored requested formats. - When checking for an epoch, Date::isEpoch just looked for strings of more than 8 digits. The additional restriction of less than or equal to 10 digits was added. This was breaking unit tests using the dateformat YMDHNS, which is reasonable. - Removed the obsolete field format hooks format-entry_time, format-start_time and format-end_time - Removed the obsolete field format hook unit tests hook.format-entry_time.t, hook.format-start_time.t and hook.format-end_time.t. - Removed use of deprecated field in hook.format-countdown_compact.t. - Added missing shortcut comparisons in Table::sort that was causing an unnecessary full parse of dates even if they were identical as strings. - Coded entry_time as a synonym for entry. Ditto for start_time and end_time. - Marked the new synonyms as deprecated. - Added bug.438.t unit test. - Added deprecated fields to the NEWS file.
95 lines
2.9 KiB
Perl
Executable File
95 lines
2.9 KiB
Perl
Executable File
#! /usr/bin/perl
|
|
################################################################################
|
|
## task - a command line task list manager.
|
|
##
|
|
## Copyright 2006 - 2010, Paul Beckingham.
|
|
## All rights reserved.
|
|
##
|
|
## This program is free software; you can redistribute it and/or modify it under
|
|
## the terms of the GNU General Public License as published by the Free Software
|
|
## Foundation; either version 2 of the License, or (at your option) any later
|
|
## version.
|
|
##
|
|
## This program is distributed in the hope that it will be useful, but WITHOUT
|
|
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
## FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
## details.
|
|
##
|
|
## You should have received a copy of the GNU General Public License along with
|
|
## this program; if not, write to the
|
|
##
|
|
## Free Software Foundation, Inc.,
|
|
## 51 Franklin Street, Fifth Floor,
|
|
## Boston, MA
|
|
## 02110-1301
|
|
## USA
|
|
##
|
|
################################################################################
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Test::More tests => 11;
|
|
|
|
# Create the rc file.
|
|
if (open my $fh, '>', 'bug.rc')
|
|
{
|
|
print $fh "data.location=.\n",
|
|
"dateformat=SNHDMY\n",
|
|
"report.foo.columns=entry,start,end,description\n",
|
|
"report.foo.dateformat=SNHDMY\n";
|
|
close $fh;
|
|
ok (-r 'bug.rc', 'Created bug.rc');
|
|
}
|
|
|
|
# Bug #438: Reports sorting by end, start, and entry are ordered incorrectly, if
|
|
# time is included.
|
|
|
|
# Ensure the two tasks have a 1 second delta in entry.
|
|
qx{../task rc:bug.rc add older};
|
|
sleep 1;
|
|
qx{../task rc:bug.rc add newer};
|
|
|
|
my $output = qx{../task rc:bug.rc rc.report.foo.sort:entry+ foo};
|
|
like ($output, qr/older.+newer/ms, 'sort:entry+ -> older newer');
|
|
|
|
$output = qx{../task rc:bug.rc rc.report.foo.sort:entry- foo};
|
|
like ($output, qr/newer.+older/ms, 'sort:entry- -> newer older');
|
|
|
|
# Ensure the two tasks have a 1 second delta in start.
|
|
qx{../task rc:bug.rc start 1};
|
|
sleep 1;
|
|
qx{../task rc:bug.rc start 2};
|
|
|
|
$output = qx{../task rc:bug.rc rc.report.foo.sort:start+ foo};
|
|
like ($output, qr/older.+newer/ms, 'sort:start+ -> older newer');
|
|
|
|
$output = qx{../task rc:bug.rc rc.report.foo.sort:start- foo};
|
|
like ($output, qr/newer.+older/ms, 'sort:start- -> newer older');
|
|
|
|
# Ensure the two tasks have a 1 second delta in end.
|
|
qx{../task rc:bug.rc done 1};
|
|
sleep 1;
|
|
qx{../task rc:bug.rc done 2};
|
|
|
|
$output = qx{../task rc:bug.rc rc.report.foo.sort:end+ foo};
|
|
like ($output, qr/older.+newer/ms, 'sort:end+ -> older newer');
|
|
|
|
$output = qx{../task rc:bug.rc rc.report.foo.sort:end- foo};
|
|
like ($output, qr/newer.+older/ms, 'sort:end- -> newer older');
|
|
|
|
# Cleanup.
|
|
unlink 'pending.data';
|
|
ok (!-r 'pending.data', 'Removed pending.data');
|
|
|
|
unlink 'completed.data';
|
|
ok (!-r 'completed.data', 'Removed completed.data');
|
|
|
|
unlink 'undo.data';
|
|
ok (!-r 'undo.data', 'Removed undo.data');
|
|
|
|
unlink 'bug.rc';
|
|
ok (!-r 'bug.rc', 'Removed bug.rc');
|
|
|
|
exit 0;
|
|
|