Tests: due.t, bug.418.t convert. Reorganize filter.t
This commit is contained in:
@@ -1,91 +0,0 @@
|
|||||||
#! /usr/bin/env perl
|
|
||||||
################################################################################
|
|
||||||
##
|
|
||||||
## Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
|
|
||||||
##
|
|
||||||
## Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
## of this software and associated documentation files (the "Software"), to deal
|
|
||||||
## in the Software without restriction, including without limitation the rights
|
|
||||||
## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
## copies of the Software, and to permit persons to whom the Software is
|
|
||||||
## furnished to do so, subject to the following conditions:
|
|
||||||
##
|
|
||||||
## The above copyright notice and this permission notice shall be included
|
|
||||||
## in all copies or substantial portions of the Software.
|
|
||||||
##
|
|
||||||
## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
## SOFTWARE.
|
|
||||||
##
|
|
||||||
## http://www.opensource.org/licenses/mit-license.php
|
|
||||||
##
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
use strict;
|
|
||||||
use warnings;
|
|
||||||
use Test::More tests => 18;
|
|
||||||
|
|
||||||
# Ensure environment has no influence.
|
|
||||||
delete $ENV{'TASKDATA'};
|
|
||||||
delete $ENV{'TASKRC'};
|
|
||||||
|
|
||||||
use File::Basename;
|
|
||||||
my $ut = basename ($0);
|
|
||||||
my $rc = $ut . '.rc';
|
|
||||||
|
|
||||||
# Create the rc file.
|
|
||||||
if (open my $fh, '>', $rc)
|
|
||||||
{
|
|
||||||
print $fh "data.location=.\n",
|
|
||||||
"dateformat=m/d/Y\n",
|
|
||||||
"report.foo.description=Sample\n",
|
|
||||||
"report.foo.columns=id,due,description\n",
|
|
||||||
"report.foo.labels=ID,Due,Description\n",
|
|
||||||
"report.foo.sort=due+\n",
|
|
||||||
"report.foo.filter=status:pending\n",
|
|
||||||
"report.foo.dateformat=MD\n";
|
|
||||||
close $fh;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Bug #418: due.before:eow not working
|
|
||||||
# - with dateformat 'MD'
|
|
||||||
qx{../src/task rc:$rc add one due:6/28/2010 2>&1};
|
|
||||||
qx{../src/task rc:$rc add two due:6/29/2010 2>&1};
|
|
||||||
qx{../src/task rc:$rc add three due:6/30/2010 2>&1};
|
|
||||||
qx{../src/task rc:$rc add four due:7/1/2010 2>&1};
|
|
||||||
qx{../src/task rc:$rc add five due:7/2/2010 2>&1};
|
|
||||||
qx{../src/task rc:$rc add six due:7/3/2010 2>&1};
|
|
||||||
qx{../src/task rc:$rc add seven due:7/4/2010 2>&1};
|
|
||||||
qx{../src/task rc:$rc add eight due:7/5/2010 2>&1};
|
|
||||||
qx{../src/task rc:$rc add nine due:7/6/2010 2>&1};
|
|
||||||
|
|
||||||
my $output = qx{../src/task rc:$rc foo 2>&1};
|
|
||||||
like ($output, qr/one/ms, "$ut: task 1 listed");
|
|
||||||
like ($output, qr/two/ms, "$ut: task 2 listed");
|
|
||||||
like ($output, qr/three/ms, "$ut: task 3 listed");
|
|
||||||
like ($output, qr/four/ms, "$ut: task 4 listed");
|
|
||||||
like ($output, qr/five/ms, "$ut: task 5 listed");
|
|
||||||
like ($output, qr/six/ms, "$ut: task 6 listed");
|
|
||||||
like ($output, qr/seven/ms, "$ut: task 7 listed");
|
|
||||||
like ($output, qr/eight/ms, "$ut: task 8 listed");
|
|
||||||
like ($output, qr/nine/ms, "$ut: task 9 listed");
|
|
||||||
|
|
||||||
$output = qx{../src/task rc:$rc foo due.before:7/2/2010 2>&1};
|
|
||||||
like ($output, qr/one/ms, "$ut: task 1 listed");
|
|
||||||
like ($output, qr/two/ms, "$ut: task 2 listed");
|
|
||||||
like ($output, qr/three/ms, "$ut: task 3 listed");
|
|
||||||
like ($output, qr/four/ms, "$ut: task 4 listed");
|
|
||||||
unlike ($output, qr/five/ms, "$ut: task 5 not listed");
|
|
||||||
unlike ($output, qr/six/ms, "$ut: task 6 not listed");
|
|
||||||
unlike ($output, qr/seven/ms, "$ut: task 7 not listed");
|
|
||||||
unlike ($output, qr/eight/ms, "$ut: task 8 not listed");
|
|
||||||
unlike ($output, qr/nine/ms, "$ut: task 9 not listed");
|
|
||||||
|
|
||||||
# Cleanup.
|
|
||||||
unlink qw(pending.data completed.data undo.data backlog.data), $rc;
|
|
||||||
exit 0;
|
|
||||||
|
|
||||||
172
test/due.t
172
test/due.t
@@ -1,72 +1,120 @@
|
|||||||
#! /usr/bin/env perl
|
#!/usr/bin/env python2.7
|
||||||
################################################################################
|
# -*- coding: utf-8 -*-
|
||||||
##
|
###############################################################################
|
||||||
## Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
|
#
|
||||||
##
|
# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
|
||||||
## Permission is hereby granted, free of charge, to any person obtaining a copy
|
#
|
||||||
## of this software and associated documentation files (the "Software"), to deal
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
## in the Software without restriction, including without limitation the rights
|
# of this software and associated documentation files (the "Software"), to deal
|
||||||
## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
# in the Software without restriction, including without limitation the rights
|
||||||
## copies of the Software, and to permit persons to whom the Software is
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
## furnished to do so, subject to the following conditions:
|
# copies of the Software, and to permit persons to whom the Software is
|
||||||
##
|
# furnished to do so, subject to the following conditions:
|
||||||
## The above copyright notice and this permission notice shall be included
|
#
|
||||||
## in all copies or substantial portions of the Software.
|
# The above copyright notice and this permission notice shall be included
|
||||||
##
|
# in all copies or substantial portions of the Software.
|
||||||
## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
#
|
||||||
## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
## SOFTWARE.
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
##
|
# SOFTWARE.
|
||||||
## http://www.opensource.org/licenses/mit-license.php
|
#
|
||||||
##
|
# http://www.opensource.org/licenses/mit-license.php
|
||||||
################################################################################
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
use strict;
|
import sys
|
||||||
use warnings;
|
import os
|
||||||
use Test::More tests => 4;
|
import unittest
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
# Ensure python finds the local simpletap module
|
||||||
|
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
# Ensure environment has no influence.
|
from basetest import Task, TestCase
|
||||||
delete $ENV{'TASKDATA'};
|
|
||||||
delete $ENV{'TASKRC'};
|
|
||||||
|
|
||||||
# Create the rc file.
|
|
||||||
if (open my $fh, '>', 'due.rc')
|
|
||||||
{
|
|
||||||
print $fh "data.location=.\n",
|
|
||||||
"due=4\n",
|
|
||||||
"color=on\n",
|
|
||||||
"color.due=red\n",
|
|
||||||
"color.alternate=\n",
|
|
||||||
"_forcecolor=on\n",
|
|
||||||
"dateformat=m/d/Y\n";
|
|
||||||
close $fh;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Add a task that is almost due, and one that is just due.
|
class TestDue(TestCase):
|
||||||
my ($d, $m, $y) = (localtime (time + 3 * 86_400))[3..5];
|
def setUp(self):
|
||||||
my $just = sprintf ("%d/%d/%d", $m + 1, $d, $y + 1900);
|
self.t = Task()
|
||||||
|
|
||||||
($d, $m, $y) = (localtime (time + 5 * 86_400))[3..5];
|
self.t.config("due", "4")
|
||||||
my $almost = sprintf ("%d/%d/%d", $m + 1, $d, $y + 1900);
|
self.t.config("color", "on")
|
||||||
|
self.t.config("color.due", "red")
|
||||||
|
self.t.config("color.alternate", "")
|
||||||
|
self.t.config("_forcecolor", "on")
|
||||||
|
self.t.config("dateformat", "m/d/Y")
|
||||||
|
|
||||||
qx{../src/task rc:due.rc add one due:$just 2>&1};
|
just = datetime.now() + timedelta(days=3)
|
||||||
qx{../src/task rc:due.rc add two due:$almost 2>&1};
|
almost = datetime.now() + timedelta(days=5)
|
||||||
my $output = qx{../src/task rc:due.rc list 2>&1};
|
# NOTE: %-m and %-d are unix only
|
||||||
like ($output, qr/\[31m.+$just.+\[0m/, 'one marked due');
|
self.just = just.strftime("%-m/%-d/%Y")
|
||||||
like ($output, qr/\s+$almost\s+/, 'two not marked due');
|
self.almost = almost.strftime("%-m/%-d/%Y")
|
||||||
|
|
||||||
qx{../src/task rc:due.rc add three due:today 2>&1};
|
self.t(("add", "one", "due:{0}".format(self.just)))
|
||||||
$output = qx{../src/task rc:due.rc list due:today 2>&1};
|
self.t(("add", "two", "due:{0}".format(self.almost)))
|
||||||
like ($output, qr/three/, 'due:today works as a filter');
|
|
||||||
|
|
||||||
$output = qx{../src/task rc:due.rc list due.is:today 2>&1};
|
def test_due(self):
|
||||||
like ($output, qr/three/, 'due.is:today works as a filter');
|
"""due tasks displayed correctly"""
|
||||||
|
code, out, err = self.t(("list",))
|
||||||
|
self.assertRegexpMatches(out, "\033\[31m.+{0}.+\033\[0m".format(self.just))
|
||||||
|
self.assertRegexpMatches(out, "\s+{0}\s+".format(self.almost))
|
||||||
|
|
||||||
# Cleanup.
|
|
||||||
unlink qw(pending.data completed.data undo.data backlog.data due.rc);
|
|
||||||
exit 0;
|
|
||||||
|
|
||||||
|
class TestBug418(TestCase):
|
||||||
|
# NOTE: Originally Bug #418: due.before:eow not working
|
||||||
|
# - with dateformat 'MD'
|
||||||
|
def setUp(self):
|
||||||
|
self.t = Task()
|
||||||
|
|
||||||
|
self.t.config("due", "4")
|
||||||
|
self.t.config("dateformat", "m/d/Y")
|
||||||
|
self.t.config("report.foo.description", "Sample")
|
||||||
|
self.t.config("report.foo.columns", "id,due,description")
|
||||||
|
self.t.config("report.foo.labels", "ID,Due,Description")
|
||||||
|
self.t.config("report.foo.sort", "due+")
|
||||||
|
self.t.config("report.foo.filter", "status:pending")
|
||||||
|
self.t.config("report.foo.dateformat", "MD")
|
||||||
|
|
||||||
|
def test_bug_418(self):
|
||||||
|
"""due.before:eow bad with dateformat 'MD'"""
|
||||||
|
self.t(("add", "one", "due:6/28/2010"))
|
||||||
|
self.t(("add", "two", "due:6/29/2010"))
|
||||||
|
self.t(("add", "three", "due:6/30/2010"))
|
||||||
|
self.t(("add", "four", "due:7/1/2010"))
|
||||||
|
self.t(("add", "five", "due:7/2/2010"))
|
||||||
|
self.t(("add", "six", "due:7/3/2010"))
|
||||||
|
self.t(("add", "seven", "due:7/4/2010"))
|
||||||
|
self.t(("add", "eight", "due:7/5/2010"))
|
||||||
|
self.t(("add", "nine", "due:7/6/2010"))
|
||||||
|
|
||||||
|
code, out, err = self.t(("foo",))
|
||||||
|
self.assertIn("one", out)
|
||||||
|
self.assertIn("two", out)
|
||||||
|
self.assertIn("three", out)
|
||||||
|
self.assertIn("four", out)
|
||||||
|
self.assertIn("five", out)
|
||||||
|
self.assertIn("six", out)
|
||||||
|
self.assertIn("seven", out)
|
||||||
|
self.assertIn("eight", out)
|
||||||
|
self.assertIn("nine", out)
|
||||||
|
|
||||||
|
code, out, err = self.t(("foo", "due.before:7/2/2010"))
|
||||||
|
self.assertIn("one", out)
|
||||||
|
self.assertIn("two", out)
|
||||||
|
self.assertIn("three", out)
|
||||||
|
self.assertIn("four", out)
|
||||||
|
self.assertNotIn("five", out)
|
||||||
|
self.assertNotIn("six", out)
|
||||||
|
self.assertNotIn("seven", out)
|
||||||
|
self.assertNotIn("eight", out)
|
||||||
|
self.assertNotIn("nine", out)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
from simpletap import TAPTestRunner
|
||||||
|
unittest.main(testRunner=TAPTestRunner())
|
||||||
|
|
||||||
|
# vim: ai sts=4 et sw=4
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
|
from datetime import datetime, timedelta
|
||||||
# Ensure python finds the local simpletap module
|
# Ensure python finds the local simpletap module
|
||||||
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
|
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
@@ -353,6 +354,37 @@ class TestFilter(TestCase):
|
|||||||
self.assertNotIn("seven", out)
|
self.assertNotIn("seven", out)
|
||||||
|
|
||||||
|
|
||||||
|
class TestFilterDue(TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.t = Task()
|
||||||
|
|
||||||
|
self.t.config("due", "4")
|
||||||
|
self.t.config("dateformat", "m/d/Y")
|
||||||
|
|
||||||
|
just = datetime.now() + timedelta(days=3)
|
||||||
|
almost = datetime.now() + timedelta(days=5)
|
||||||
|
# NOTE: %-m and %-d are unix only
|
||||||
|
self.just = just.strftime("%-m/%-d/%Y")
|
||||||
|
self.almost = almost.strftime("%-m/%-d/%Y")
|
||||||
|
|
||||||
|
def test_due_filter(self):
|
||||||
|
"""due tasks filtered correctly"""
|
||||||
|
|
||||||
|
self.t(("add", "one", "due:{0}".format(self.just)))
|
||||||
|
self.t(("add", "two", "due:{0}".format(self.almost)))
|
||||||
|
self.t(("add", "three", "due:today"))
|
||||||
|
|
||||||
|
code, out, err = self.t(("list", "due:today"))
|
||||||
|
self.assertNotIn("one", out)
|
||||||
|
self.assertNotIn("two", out)
|
||||||
|
self.assertIn("three", out)
|
||||||
|
|
||||||
|
code, out, err = self.t(("list", "due.is:today"))
|
||||||
|
self.assertNotIn("one", out)
|
||||||
|
self.assertNotIn("two", out)
|
||||||
|
self.assertIn("three", out)
|
||||||
|
|
||||||
|
|
||||||
class TestBug1110(TestCase):
|
class TestBug1110(TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.t = Task()
|
self.t = Task()
|
||||||
|
|||||||
Reference in New Issue
Block a user