Merge branch 'master' into 2.4.0

This commit is contained in:
Paul Beckingham 2014-01-15 22:17:30 -05:00
commit cd6067a39f
31 changed files with 139 additions and 219 deletions

View file

@ -38,7 +38,11 @@ delete $ENV{'TASKRC'};
if (open my $fh, '>', 'annual.rc')
{
print $fh "data.location=.\n",
"dateformat=m/d/Y\n";
"dateformat=m/d/Y\n",
"report.annual.labels=ID,Due,Description\n",
"report.annual.columns=id,due,description\n",
"report.annual.filter=status:pending\n",
"report.annual.sort=due+\n";
close $fh;
ok (-r 'annual.rc', 'Created annual.rc');
}
@ -46,32 +50,32 @@ if (open my $fh, '>', 'annual.rc')
# If a task is added with a due date ten years ago, with an annual recurrence,
# then the synthetic tasks in between then and now have a due date that creeps.
#
# ID Project Pri Due Active Description
# -- ------- --- ---------- ------ -----------
# 2 1/1/2000 foo
# 3 12/31/2000 foo
# 4 12/31/2001 foo
# 5 12/31/2002 foo
# 6 12/31/2003 foo
# 7 12/30/2004 foo
# 8 12/30/2005 foo
# 9 12/30/2006 foo
# 10 12/30/2007 foo
# 11 13/29/2008 foo
# 12 12/29/2009 foo
# ID Due Description
# -- ---------- -----------
# 4 1/1/2002 foo
# 5 1/1/2003 foo
# 6 1/1/2004 foo
# 7 1/1/2005 foo
# 8 1/1/2006 foo
# 9 1/1/2007 foo
# 10 1/1/2008 foo
# 11 1/1/2009 foo
# 12 1/1/2010 foo
# 2 1/1/2000 foo
# 3 1/1/2001 foo
qx{../src/task rc:annual.rc add foo due:1/1/2000 recur:annual until:1/1/2009 2>&1};
my $output = qx{../src/task rc:annual.rc list 2>&1};
like ($output, qr/2\s+R\s+1\/1\/2000\s+.+foo/, 'synthetic 2 no creep');
like ($output, qr/3\s+R\s+1\/1\/2001\s+.+foo/, 'synthetic 3 no creep');
like ($output, qr/4\s+R\s+1\/1\/2002\s+.+foo/, 'synthetic 4 no creep');
like ($output, qr/5\s+R\s+1\/1\/2003\s+.+foo/, 'synthetic 5 no creep');
like ($output, qr/6\s+R\s+1\/1\/2004\s+.+foo/, 'synthetic 6 no creep');
like ($output, qr/7\s+R\s+1\/1\/2005\s+.+foo/, 'synthetic 7 no creep');
like ($output, qr/8\s+R\s+1\/1\/2006\s+.+foo/, 'synthetic 8 no creep');
like ($output, qr/9\s+R\s+1\/1\/2007\s+.+foo/, 'synthetic 9 no creep');
like ($output, qr/10\s+R\s+1\/1\/2008\s+.+foo/, 'synthetic 10 no creep');
like ($output, qr/11\s+R\s+1\/1\/2009\s+.+foo/, 'synthetic 11 no creep');
my $output = qx{../src/task rc:annual.rc annual 2>&1};
like ($output, qr/2\s+1\/1\/2000\s+foo/, 'synthetic 2 no creep');
like ($output, qr/3\s+1\/1\/2001\s+foo/, 'synthetic 3 no creep');
like ($output, qr/4\s+1\/1\/2002\s+foo/, 'synthetic 4 no creep');
like ($output, qr/5\s+1\/1\/2003\s+foo/, 'synthetic 5 no creep');
like ($output, qr/6\s+1\/1\/2004\s+foo/, 'synthetic 6 no creep');
like ($output, qr/7\s+1\/1\/2005\s+foo/, 'synthetic 7 no creep');
like ($output, qr/8\s+1\/1\/2006\s+foo/, 'synthetic 8 no creep');
like ($output, qr/9\s+1\/1\/2007\s+foo/, 'synthetic 9 no creep');
like ($output, qr/10\s+1\/1\/2008\s+foo/, 'synthetic 10 no creep');
like ($output, qr/11\s+1\/1\/2009\s+foo/, 'synthetic 11 no creep');
$output = qx{../src/task rc:annual.rc diag 2>&1};
like ($output, qr/No duplicates found/, 'No duplicate UUIDs detected');

View file

@ -37,7 +37,8 @@ delete $ENV{'TASKRC'};
# Create the rc file.
if (open my $fh, '>', 'pri.rc')
{
print $fh "data.location=.\n";
print $fh "data.location=.\n",
"verbose=off\n";
close $fh;
ok (-r 'pri.rc', 'Created pri.rc');
}