diff --git a/test/bug.455.t b/test/bug.455.t deleted file mode 100755 index 1bbf9a478..000000000 --- a/test/bug.455.t +++ /dev/null @@ -1,62 +0,0 @@ -#! /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 -## -################################################################################ - -use strict; -use warnings; -use Test::More tests => 2; - -# Ensure environment has no influence. -delete $ENV{'TASKDATA'}; -delete $ENV{'TASKRC'}; - -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", - "print.empty.columns=no\n"; - close $fh; -} - -# Bug #455 - Text alignment in reports is broken when text contains wide utf8 -# characters - -qx{../src/task rc:$rc add abc pro:Bar\x{263A} 2>&1}; -qx{../src/task rc:$rc add def pro:Foo 2>&1}; - -my $output = qx{../src/task rc:$rc ls 2>&1}; - -# Project + ' ' == 4 -like ($output, qr/\S\s{4}abc/ms, "$ut: correct spacing in utf8 task"); -like ($output, qr/\S\s{5}def/ms, "$ut: correct spacing in non utf8 task"); - -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data), $rc; -exit 0; diff --git a/test/encoding.t b/test/encoding.t index 66d910b25..d6b1e9594 100755 --- a/test/encoding.t +++ b/test/encoding.t @@ -28,6 +28,7 @@ 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__))) @@ -58,6 +59,22 @@ class TestUtf8(TestCase): self.assertNotIn("two", out) self.assertIn("one", out) + def test_wide_utf8(self): + """Text alignment in reports with wide utf8 characters""" + # Originally Bug #455 - Text alignment in reports is broken when text + # contains wide utf8 characters + self.t.config("print.empty.columns", "no") + + self.t(("add", "abc", "pro:Bar\u263a")) + self.t(("add", "def", "pro:Foo")) + + code, out, err = self.t(("ls",)) + + expected = re.compile("\S\s{4}abc", re.MULTILINE) + self.assertRegexpMatches(out, expected) + expected = re.compile("\S\s{5}def", re.MULTILINE) + self.assertRegexpMatches(out, expected) + if __name__ == "__main__": from simpletap import TAPTestRunner