diff --git a/test/bug.1063.t b/test/bug.1063.t index bb2afc206..cca1192d5 100755 --- a/test/bug.1063.t +++ b/test/bug.1063.t @@ -1,72 +1,74 @@ -#! /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 -## -################################################################################ +#!/usr/bin/env python2.7 +# -*- coding: utf-8 -*- +############################################################################### +# +# 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 => 6; +import sys +import os +import re +import unittest +# Ensure python finds the local simpletap module +sys.path.append(os.path.dirname(os.path.abspath(__file__))) -# Ensure environment has no influence. -delete $ENV{'TASKDATA'}; -delete $ENV{'TASKRC'}; +from basetest import Task, TestCase -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", - "confirmation=off\n", - "uda.foo.type=numeric\n", - "uda.foo.label=Foo\n", - "report.bar.columns=foo,description\n", - "report.bar.description=Bar\n", - "report.bar.labels=Foo,Desc\n", - "report.bar.sort=foo-\n"; - close $fh; -} +class TestBug1063(TestCase): + def setUp(self): + self.t = Task() -# Bug 1063 - Numeric UDA fields are not sortable. -qx{../src/task rc:$rc add four foo:4 2>&1}; -ok ($? == 0, "$ut: add four"); -qx{../src/task rc:$rc add one foo:1 2>&1}; -ok ($? == 0, "$ut: add one"); -qx{../src/task rc:$rc add three foo:3 2>&1}; -ok ($? == 0, "$ut: add three"); -qx{../src/task rc:$rc add two foo:2 2>&1}; -ok ($? == 0, "$ut: add two"); + self.t.config("uda.foo.type", "numeric") + self.t.config("uda.foo.label", "Foo") + self.t.config("report.bar.columns", "foo,description") + self.t.config("report.bar.description", "Bar") + self.t.config("report.bar.labels", "Foo,Desc") + self.t.config("report.bar.sort", "foo-") -my $output = qx{../src/task rc:$rc bar 2>&1}; -like ($output, qr/4.+3.+2.+1/ms, "$ut: Default descending sort correct"); + def test_sortable_uda(self): + """numeric UDA fields are sortable -$output = qx{../src/task rc:$rc bar rc.report.bar.sort=foo+ 2>&1}; -like ($output, qr/1.+2.+3.+4/ms, "$ut: Default ascending sort correct"); + Reported as bug 1063 + """ -## Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data), $rc; -exit 0; + self.t(("add", "four", "foo:4")) + self.t(("add", "one", "foo:1")) + self.t(("add", "three", "foo:3")) + self.t(("add", "two", "foo:2")) + + code, out, err = self.t(("bar",)) + expected = re.compile("4.+3.+2.+1", re.DOTALL) # dot matches \n too + self.assertRegexpMatches(out, expected) + + code, out, err = self.t(("bar", "rc.report.bar.sort=foo+")) + expected = re.compile("1.+2.+3.+4", re.DOTALL) # dot matches \n too + self.assertRegexpMatches(out, expected) + + +if __name__ == "__main__": + from simpletap import TAPTestRunner + unittest.main(testRunner=TAPTestRunner()) + +# vim: ai sts=4 et sw=4