From c879eb6811b698f2289c0d0f3b72f71ea519b11b Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 10 Oct 2011 22:54:28 -0400 Subject: [PATCH] Code Cleanup - Renamed recur.t to recur.sort.t, because more recur unit tests are on the way, and this one was a misnomer. - Minor edits - whitespace. --- src/Task.cpp | 1 - test/recur.sort.t | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100755 test/recur.sort.t diff --git a/src/Task.cpp b/src/Task.cpp index 125e5565f..123b94597 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////////////// - #define L10N // Localization complete. #include diff --git a/test/recur.sort.t b/test/recur.sort.t new file mode 100755 index 000000000..6bdb6e67d --- /dev/null +++ b/test/recur.sort.t @@ -0,0 +1,66 @@ +#! /usr/bin/perl +################################################################################ +## taskwarrior - a command line task list manager. +## +## Copyright 2006-2011, 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; + +# Create the rc file. +if (open my $fh, '>', 'recur.rc') +{ + print $fh "data.location=.\n", + "report.asc.columns=id,recur,description\n", + "report.asc.sort=recur+\n", + "report.desc.columns=id,recur,description\n", + "report.desc.sort=recur-\n"; + close $fh; + ok (-r 'recur.rc', 'Created recur.rc'); +} + +# Create a few recurring tasks, and test the sort order of the recur column. +qx{../src/task rc:recur.rc add due:tomorrow recur:daily first}; +qx{../src/task rc:recur.rc add due:tomorrow recur:weekly second}; +qx{../src/task rc:recur.rc add due:tomorrow recur:3d third}; + +my $output = qx{../src/task rc:recur.rc asc}; +like ($output, qr/first .* third .* second/msx, 'daily 3d weekly'); + +$output = qx{../src/task rc:recur.rc desc}; +like ($output, qr/second .* third .* first/msx, 'weekly 3d daily'); + +# Cleanup. +unlink qw(pending.data completed.data undo.data backlog.data synch.key recur.rc); +ok (! -r 'pending.data' && + ! -r 'completed.data' && + ! -r 'undo.data' && + ! -r 'backlog.data' && + ! -r 'synch.key' && + ! -r 'recur.rc', 'Cleanup'); + +exit 0; +