From 5eaf09759e2813d1a5d337a8e2263b73451ead62 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 10 Jul 2015 12:48:25 -0400 Subject: [PATCH] Test: Converted to Python - But doesn't work - problem with test framework? --- test/bug.annotate.t | 115 ++++++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 53 deletions(-) diff --git a/test/bug.annotate.t b/test/bug.annotate.t index 807c1ba9b..80b1569c6 100755 --- a/test/bug.annotate.t +++ b/test/bug.annotate.t @@ -1,62 +1,71 @@ -#! /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"; - close $fh; -} +class TestAnnotation(TestCase): -# Attempt a blank annotation. -qx{../src/task rc:$rc add foo 2>&1}; -my $output = qx{../src/task rc:$rc 1 annotate 2>&1 >/dev/null}; -like ($output, qr/Additional text must be provided/, "$ut: failed on blank annotation"); + def setUp(self): + """Executed before each test in the class""" + self.t = Task() + self.t.config("confirmation", "yes") -# Attempt an annotation without ID -$output = qx{echo "n" | ../src/task rc:$rc annotate bar 2>&1 >/dev/null}; -like ($output, qr/Command prevented from running/, "$ut: Filter-less write command inhibited"); + def test_blank_annotation(self): + """Verify blank annotations are prevented""" + self.t("add foo") + code, out, err = self.t.runError("1 annotate") + self.assertIn("Additional text must be provided", err) -$output = qx{echo "y" | ../src/task rc:$rc annotate bar 2>&1 >/dev/null}; -unlike ($output, qr/Command prevented from running/, "$ut: Filter-less write command permitted"); + def test_filterless_annotate_decline(self): + """Verify filterless annotation is trapped, declined""" + code, out, err = self.t.runError(("annotate", "bar"), input="no\n") -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data), $rc; -exit 0; + # Fails. This output is not seen until after the "no\n" has been processed. + self.assertIn("Command prevented from running", out) + def test_filterless_annotate(self): + """Verify filterless annotation is trapped, overridden""" + code, out, err = self.t(("annotate", "bar"), input="yes\n") + + # Fails. This output is not seen until after the "yes\n" has been processed. + self.assertNotIn("Command prevented from running", out) + self.assertIn("Annotated 1 task", out) + + +if __name__ == "__main__": + from simpletap import TAPTestRunner + unittest.main(testRunner=TAPTestRunner()) + +# vim: ai sts=4 et sw=4