From 38b056b289a94997e5c5bb6a5159fb4037aa82df Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 22 Jul 2015 23:00:30 -0400 Subject: [PATCH] Test: Converted to Python --- test/bug.649.t | 2 +- test/bug.804.t | 121 ++++++++++++++++++++++++------------------------- 2 files changed, 60 insertions(+), 63 deletions(-) diff --git a/test/bug.649.t b/test/bug.649.t index 985364f48..fdcd2098e 100755 --- a/test/bug.649.t +++ b/test/bug.649.t @@ -40,7 +40,7 @@ class TestBug649(TestCase): """Executed before each test in the class""" self.t = Task() - def test_(self): + def test_delete_recurring_immediately(self): """Verify that recurring tasks cannot be immediately marked completed""" self.t("add one due:3d recur:1week") code, out, err = self.t.runError("1 done") diff --git a/test/bug.804.t b/test/bug.804.t index 0a271ee8d..50b24bf82 100755 --- a/test/bug.804.t +++ b/test/bug.804.t @@ -1,72 +1,69 @@ -#! /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 => 4; +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", - "bulk=100\n", - "confirmation=no\n", - "print.empty.columns=yes\n", - "report.unittest.labels=ID,Project,Pri,Description\n", - "report.unittest.columns=id,project,priority,description\n", - "report.unittest.filter=status:pending\n"; - close $fh; -} +class TestBug804(TestCase): + def setUp(self): + """Executed before each test in the class""" + self.t = Task() -# Bug 804: URL link and break line + def test_(self): + """Verify hyphenation is controllable""" + self.t.config("print.empty.columns", "yes") + self.t.config("report.unittest.labels", "ID,Project,Pri,Description") + self.t.config("report.unittest.columns", "id,project,priority,description") + self.t.config("report.unittest.filter", "status:pending") -# Setup: Add a tasks, annotate with long word. -qx{../src/task rc:$rc add One 2>&1}; -qx{../src/task rc:$rc 1 annotate abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz 2>&1}; + # Setup: Add a tasks, annotate with long word. + self.t("add one") + self.t("1 annotate abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz") -# List with rc.hyphenate=on. -my $output = qx{../src/task rc:$rc rc.defaultwidth:40 rc.hyphenate:on unittest 2>&1}; -like ($output, qr/vwx-\n/ms, "$ut: hyphenated 1"); -like ($output, qr/tuv-\n/ms, "$ut: hyphenated 2"); + # List with rc.hyphenate=on. + code, out, err = self.t("rc.defaultwidth:40 rc.hyphenate:on unittest") + self.assertIn("vwx-\n", out) + self.assertIn("tuv-\n", out) -# List with rc.hyphenate=off. -$output = qx{../src/task rc:$rc rc.defaultwidth:40 rc.hyphenate:off unittest 2>&1}; -like ($output, qr/vwxy\n/ms, "$ut: not hyphenated 1"); -like ($output, qr/uvwx\n/ms, "$ut: not hyphenated 2"); + # List with rc.hyphenate=off. + code, out, err = self.t("rc.defaultwidth:40 rc.hyphenate:off unittest") + self.assertIn("vwxy\n", out) + self.assertIn("uvwx\n", out) -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data), $rc; -exit 0; +if __name__ == "__main__": + from simpletap import TAPTestRunner + unittest.main(testRunner=TAPTestRunner()) + +# vim: ai sts=4 et sw=4