GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-21 16:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Bug #804 - URL link and break line

Browse source 
- Addressed bug #804 by allowing rc.hyphenate to control whether hyphens are
  inserted when long lines are broken.  This may help prevent xterm from
  mis-parsing URLs in task annotations, when wrapped (thanks to Yann Davin).
- Added unit tests.
This commit is contained in:
Paul Beckingham 2011-08-17 22:39:28 -04:00
parent 08fcb5362e
commit 7dd3e081c7
20 changed files with 147 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

79
test/bug.804.t Executable file
View file

@ -0,0 +1,79 @@
#! /usr/bin/perl
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
## All rights reserved.
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
## Foundation; either version 2 of the License, or (at your option) any later
## version.
##
## This program is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
## FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
## details.
##
## You should have received a copy of the GNU General Public License along with
## this program; if not, write to the
##
## Free Software Foundation, Inc.,
## 51 Franklin Street, Fifth Floor,
## Boston, MA
## 02110-1301
## USA
##
################################################################################
use strict;
use warnings;
use Test::More tests => 11;
# Create the rc file.
if (open my $fh, '>', 'bug.rc')
{
print $fh "data.location=.\n";
print $fh "bulk=100\n";
print $fh "confirmation=no\n";
close $fh;
ok (-r 'bug.rc', 'Created bug.rc');
}
# Bug 804: URL link and break line
# Setup: Add a tasks, annotate with long word.
qx{../src/task rc:bug.rc add One};
qx{../src/task rc:bug.rc 1 annotate abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz};
# List with rc.hyphenate=on.
my $output = qx{../src/task rc:bug.rc rc.defaultwidth:40 rc.hyphenate:on ls};
like ($output, qr/vwx-$/ms, 'hyphenated 1');
like ($output, qr/tuv-$/ms, 'hyphenated 2');
# List with rc.hyphenate=off.
$output = qx{../src/task rc:bug.rc rc.defaultwidth:40 rc.hyphenate:off ls};
like ($output, qr/vwxy$/ms, 'not hyphenated 1');
like ($output, qr/uvwx$/ms, 'not hyphenated 2');
# Cleanup.
unlink 'pending.data';
ok (!-r 'pending.data', 'Removed pending.data');
unlink 'completed.data';
ok (!-r 'completed.data', 'Removed completed.data');
unlink 'undo.data';
ok (!-r 'undo.data', 'Removed undo.data');
unlink 'backlog.data';
ok (!-r 'backlog.data', 'Removed backlog.data');
unlink 'synch.key';
ok (!-r 'synch.key', 'Removed synch.key');
unlink 'bug.rc';
ok (!-r 'bug.rc', 'Removed bug.rc');
exit 0;

24
test/text.t.cpp
View file

@ -37,10 +37,10 @@ int main (int argc, char** argv)
{
UnitTest t (262);
// void wrapText (std::vector <std::string>& lines, const std::string& text, const int width)
// void wrapText (std::vector <std::string>& lines, const std::string& text, const int width, bool hyphenate)
std::string text = "This is a test of the line wrapping code.";
std::vector <std::string> lines;
wrapText (lines, text, 10);
wrapText (lines, text, 10, true);
t.is (lines.size (), (size_t) 5, "wrapText 'This is a test of the line wrapping code.' -> total 5 lines");
t.is (lines[0], "This is a", "wrapText line 0 -> 'This is a'");
t.is (lines[1], "test of", "wrapText line 1 -> 'test of'");
@ -51,7 +51,7 @@ int main (int argc, char** argv)
// void wrapText (std::vector <std::string>& lines, const std::string& text, const int width)
text = "This ☺ is a test of utf8 line extraction.";
lines.clear ();
wrapText (lines, text, 7);
wrapText (lines, text, 7, true);
t.is (lines.size (), (size_t) 7, "wrapText 'This ☺ is a test of utf8 line extraction.' -> total 7 lines");
t.is (lines[0], "This ☺", "wrapText line 0 -> 'This ☺'");
t.is (lines[1], "is a", "wrapText line 1 -> 'is a'");
@ -61,33 +61,33 @@ int main (int argc, char** argv)
t.is (lines[5], "extrac-", "wrapText line 5 -> 'extrac-'");
t.is (lines[6], "tion.", "wrapText line 6 -> 'tion.'");
// void extractLine (std::string& text, std::string& line, int length)
// void extractLine (std::string& text, std::string& line, int length, bool hyphenate)
text = "This ☺ is a test of utf8 line extraction.";
std::string line;
extractLine (text, line, 7);
extractLine (text, line, 7, true);
t.is (line, "line 1", "extractLine 7 'This ☺ is a test of utf8 line extraction.' -> 'This ☺'");
// void extractLine (std::string& text, std::string& line, int length)
text = "line 1\nlengthy second line that exceeds width";
extractLine (text, line, 10);
extractLine (text, line, 10, true);
t.is (line, "line 1", "extractLine 10 'line 1\\nlengthy second line that exceeds width' -> 'line 1'");
extractLine (text, line, 10);
extractLine (text, line, 10, true);
t.is (line, "lengthy", "extractLine 10 'lengthy second line that exceeds width' -> 'lengthy'");
extractLine (text, line, 10);
extractLine (text, line, 10, true);
t.is (line, "second", "extractLine 10 'second line that exceeds width' -> 'second'");
extractLine (text, line, 10);
extractLine (text, line, 10, true);
t.is (line, "line that", "extractLine 10 'line that exceeds width' -> 'line that'");
extractLine (text, line, 10);
extractLine (text, line, 10, true);
t.is (line, "exceeds", "extractLine 10 'exceeds width' -> 'exceeds'");
extractLine (text, line, 10);
extractLine (text, line, 10, true);
t.is (line, "width", "extractLine 10 'width' -> 'width'");
extractLine (text, line, 10);
extractLine (text, line, 10, true);
t.is (line, "", "extractLine 10 '' -> ''");
// void split (std::vector<std::string>& results, const std::string& input, const char delimiter)