diff --git a/test/feature.1061.t b/test/feature.1061.t index 0befe6a56..23e5eb0a3 100755 --- a/test/feature.1061.t +++ b/test/feature.1061.t @@ -1,59 +1,62 @@ -#! /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 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 -# Create the rc file. -if (open my $fh, '>', 'bug.rc') -{ - print $fh "data.location=.\n", - "color=off\n"; - close $fh; -} -# Test: task columns -# task columns descr -my $output = qx{../src/task rc:bug.rc columns 2>/dev/null}; -like ($output, qr/description/, 'columns - found description'); -like ($output, qr/uuid/, 'columns - found uuid'); -like ($output, qr/project/, 'columns - found project'); +class TestFeature1061(TestCase): + def setUp(self): + """Executed before each test in the class""" + self.t = Task() -$output = qx{../src/task rc:bug.rc columns escr 2>/dev/null}; -like ($output, qr/description/, 'columns - found \'escr\' in description'); -unlike ($output, qr/uuid/, 'columns - did not find \'escr\' in uuid'); -unlike ($output, qr/project/, 'columns - did not find \'escr\' in project'); + def test_columns(self): + """Verify 'task columns' works""" + code, out, err = self.t("columns") + self.assertIn("description", out) + self.assertIn("uuid", out) + self.assertIn("project", out) -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data bug.rc); -exit 0; + def test_columns_specific(self): + """Verify 'task columns escr' works""" + code, out, err = self.t("columns escr") + self.assertIn("description", out) + self.assertNotIn("uuid", out) + self.assertNotIn("project", out) + +if __name__ == "__main__": + from simpletap import TAPTestRunner + unittest.main(testRunner=TAPTestRunner()) + +# vim: ai sts=4 et sw=4