From e1b93495ca98b6cf7d2d259dd70602731d7444e0 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 4 Jul 2015 23:23:26 -0400 Subject: [PATCH] Test: Combined label.t, custom.t --- test/custom.t | 122 +++++++++++++++++++++++++++----------------------- test/label.t | 65 --------------------------- 2 files changed, 66 insertions(+), 121 deletions(-) delete mode 100755 test/label.t diff --git a/test/custom.t b/test/custom.t index e5467a039..6ae6e308b 100755 --- a/test/custom.t +++ b/test/custom.t @@ -1,64 +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 => 3; +import sys +import os +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", - "report.foo.description=DESC\n", - "report.foo.columns=id,description\n", - "report.foo.sort=id+\n", - "report.foo.filter=project:A\n"; - close $fh; -} +class TestCustomReports(TestCase): -# Generate the help screen, and locate the custom report on it. -my $output = qx{../src/task rc:$rc help 2>&1}; -like ($output, qr/task foo\s+DESC\n/m, "$ut: report.foo"); + def setUp(self): + """Executed before each test in the class""" + self.t = Task() + self.t.config("report.foo.description", "DESC") + self.t.config("report.foo.labels", "ID,DESCRIPTION") + self.t.config("report.foo.columns", "id,description") + self.t.config("report.foo.sort", "id+") + self.t.config("report.foo.filter", "project:A") -qx{../src/task rc:$rc add project:A one 2>&1}; -qx{../src/task rc:$rc add two 2>&1}; -$output = qx{../src/task rc:$rc foo 2>&1}; -like ($output, qr/one/, "$ut: custom filter included"); -unlike ($output, qr/two/, "$ut: custom filter excluded"); + def test_custom_report_help(self): + """Verify custom report description is shown in help""" + code, out, err = self.t("help") + self.assertRegexpMatches(out, "task foo\s+DESC\n") -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data), $rc; -exit 0; + def test_custom_filter(self): + """Verify custome report filtr is applied""" + self.t("add project:A one") + self.t("add two") + code, out, err = self.t("foo") + self.assertIn("one", out) + self.assertNotIn("two", out) + def test_custom_labels(self): + """Verify that custom labels are used in reports""" + self.t("add one project:A") + code, out, err = self.t("foo") + self.assertIn("ID", out) + self.assertIn("DESCRIPTION", out) + + +if __name__ == "__main__": + from simpletap import TAPTestRunner + unittest.main(testRunner=TAPTestRunner()) + +# vim: ai sts=4 et sw=4 diff --git a/test/label.t b/test/label.t deleted file mode 100755 index 20ecb3bac..000000000 --- a/test/label.t +++ /dev/null @@ -1,65 +0,0 @@ -#!/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 -# -############################################################################### - -import sys -import os -import unittest -# Ensure python finds the local simpletap module -sys.path.append(os.path.dirname(os.path.abspath(__file__))) - -from basetest import Task, TestCase - - -class TestCustomLabel(TestCase): - - def setUp(self): - """Executed before each test in the class""" - self.t = Task() - self.t.config("report.foo.description", "DESC") - self.t.config("report.foo.labels", "ID,DESCRIPTION") - self.t.config("report.foo.columns", "id,description") - self.t.config("report.foo.sort", "id+") - - def test_custom_help(self): - """Verify that custom description is used in help""" - code, out, err = self.t("help") - self.assertRegexpMatches(out, "task foo\s+DESC\n") - - def test_custom_labels(self): - """Verify that custom labels are used in reports""" - self.t("add one") - code, out, err = self.t("foo") - self.assertIn("ID", out) - self.assertIn("DESCRIPTION", out) - - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4