diff --git a/src/E9.cpp b/src/E9.cpp index 65ec62f7a..0824ed49c 100644 --- a/src/E9.cpp +++ b/src/E9.cpp @@ -232,7 +232,6 @@ void E9::operator_not (Arg& result, Arg& right) //////////////////////////////////////////////////////////////////////////////// void E9::operator_and (Arg& result, Arg& left, Arg& right) { - // Assume failure. result._value = "false"; result._type = Arg::type_bool; @@ -248,7 +247,6 @@ void E9::operator_and (Arg& result, Arg& left, Arg& right) //////////////////////////////////////////////////////////////////////////////// void E9::operator_or (Arg& result, Arg& left, Arg& right) { - // Assume failure. result._value = "false"; result._type = Arg::type_bool; @@ -264,7 +262,6 @@ void E9::operator_or (Arg& result, Arg& left, Arg& right) //////////////////////////////////////////////////////////////////////////////// void E9::operator_xor (Arg& result, Arg& left, Arg& right) { - // Assume failure. result._value = "false"; result._type = Arg::type_bool; diff --git a/test/op_gt.t b/test/op_gt.t index 6617c7aaa..109c64c09 100755 --- a/test/op_gt.t +++ b/test/op_gt.t @@ -28,7 +28,7 @@ use strict; use warnings; -use Test::More tests => 23; +use Test::More tests => 27; # Create the rc file. if (open my $fh, '>', 'op.rc') @@ -52,24 +52,30 @@ like ($output, qr/two/, 'ls due.after:today --> two'); unlike ($output, qr/three/, 'ls due.after:today --> !three'); unlike ($output, qr/four/, 'ls due.after:today --> !four'); -my $output = qx{../src/task rc:op.rc ls 'due > today'}; +$output = qx{../src/task rc:op.rc ls 'due > today'}; unlike ($output, qr/one/, 'ls due > today --> !one'); like ($output, qr/two/, 'ls due > today --> two'); unlike ($output, qr/three/, 'ls due > today --> !three'); unlike ($output, qr/four/, 'ls due > today --> !four'); -my $output = qx{../src/task rc:op.rc ls priority.above:L}; +$output = qx{../src/task rc:op.rc ls priority.above:L}; like ($output, qr/one/, 'ls priority.above:L --> one'); like ($output, qr/two/, 'ls priority.above:L --> two'); unlike ($output, qr/three/, 'ls priority.above:L --> !three'); unlike ($output, qr/four/, 'ls priority.above:L --> !four'); -my $output = qx{../src/task rc:op.rc ls 'priority > L'}; +$output = qx{../src/task rc:op.rc ls 'priority > L'}; like ($output, qr/one/, 'ls priority > L --> one'); like ($output, qr/two/, 'ls priority > L --> two'); unlike ($output, qr/three/, 'ls priority > L --> !three'); unlike ($output, qr/four/, 'ls priority > L --> !four'); +$output = qx{../src/task rc:op.rc ls 'description > t'}; +unlike ($output, qr/one/, 'ls description > t --> !one'); +like ($output, qr/two/, 'ls description > t --> two'); +like ($output, qr/three/, 'ls description > t --> three'); +unlike ($output, qr/four/, 'ls description > t --> !four'); + # Cleanup. unlink 'pending.data'; ok (!-r 'pending.data', 'Removed pending.data'); diff --git a/test/op_gte.t b/test/op_gte.t new file mode 100755 index 000000000..161a6c33e --- /dev/null +++ b/test/op_gte.t @@ -0,0 +1,81 @@ +#! /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 => 15; + +# Create the rc file. +if (open my $fh, '>', 'op.rc') +{ + print $fh "data.location=.\n", + "confirmation=no\n"; + close $fh; + ok (-r 'op.rc', 'Created op.rc'); +} + +# Setup: Add a task +qx{../src/task rc:op.rc add one priority:H}; +qx{../src/task rc:op.rc add two priority:M}; +qx{../src/task rc:op.rc add three priority:L}; +qx{../src/task rc:op.rc add four }; + +# Test the '>=' operator. +my $output = qx{../src/task rc:op.rc ls 'priority >= M'}; +like ($output, qr/one/, 'ls priority >= M --> one'); +like ($output, qr/two/, 'ls priority >= M --> two'); +unlike ($output, qr/three/, 'ls priority >= M --> !three'); +unlike ($output, qr/four/, 'ls priority >= M --> !four'); + +$output = qx{../src/task rc:op.rc ls 'description >= t'}; +unlike ($output, qr/one/, 'ls description >= t --> !one'); +like ($output, qr/two/, 'ls description >= t --> two'); +like ($output, qr/three/, 'ls description >= t --> three'); +unlike ($output, qr/four/, 'ls description >= t --> !four'); + +# 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 'op.rc'; +ok (!-r 'op.rc', 'Removed op.rc'); + +exit 0; + diff --git a/test/op_lt.t b/test/op_lt.t index 696104b40..e6ee4b1e8 100755 --- a/test/op_lt.t +++ b/test/op_lt.t @@ -28,7 +28,7 @@ use strict; use warnings; -use Test::More tests => 23; +use Test::More tests => 27; # Create the rc file. if (open my $fh, '>', 'op.rc') @@ -52,24 +52,30 @@ unlike ($output, qr/two/, 'ls due.before:today --> !two'); unlike ($output, qr/three/, 'ls due.before:today --> !three'); unlike ($output, qr/four/, 'ls due.before:today --> !four'); -my $output = qx{../src/task rc:op.rc ls 'due < today'}; +$output = qx{../src/task rc:op.rc ls 'due < today'}; like ($output, qr/one/, 'ls due < today --> one'); unlike ($output, qr/two/, 'ls due < today --> !two'); unlike ($output, qr/three/, 'ls due < today --> !three'); unlike ($output, qr/four/, 'ls due < today --> !four'); -my $output = qx{../src/task rc:op.rc ls priority.below:H}; +$output = qx{../src/task rc:op.rc ls priority.below:H}; unlike ($output, qr/one/, 'ls priority.below:H --> !one'); like ($output, qr/two/, 'ls priority.below:H --> two'); like ($output, qr/three/, 'ls priority.below:H --> three'); like ($output, qr/four/, 'ls priority.below:H --> four'); -my $output = qx{../src/task rc:op.rc ls 'priority < H'}; +$output = qx{../src/task rc:op.rc ls 'priority < H'}; unlike ($output, qr/one/, 'ls priority < H --> !one'); like ($output, qr/two/, 'ls priority < H --> two'); like ($output, qr/three/, 'ls priority < H --> three'); like ($output, qr/four/, 'ls priority < H --> four'); +$output = qx{../src/task rc:op.rc ls 'description < t'}; +like ($output, qr/one/, 'ls description < t --> one'); +unlike ($output, qr/two/, 'ls description < t --> !two'); +unlike ($output, qr/three/, 'ls description < t --> !three'); +like ($output, qr/four/, 'ls description < t --> four'); + # Cleanup. unlink 'pending.data'; ok (!-r 'pending.data', 'Removed pending.data'); diff --git a/test/op_lte.t b/test/op_lte.t new file mode 100755 index 000000000..c35bec6e3 --- /dev/null +++ b/test/op_lte.t @@ -0,0 +1,81 @@ +#! /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 => 15; + +# Create the rc file. +if (open my $fh, '>', 'op.rc') +{ + print $fh "data.location=.\n", + "confirmation=no\n"; + close $fh; + ok (-r 'op.rc', 'Created op.rc'); +} + +# Setup: Add a task +qx{../src/task rc:op.rc add one priority:H}; +qx{../src/task rc:op.rc add two priority:M}; +qx{../src/task rc:op.rc add three priority:L}; +qx{../src/task rc:op.rc add four }; + +# Test the '<=' operator. +my $output = qx{../src/task rc:op.rc ls 'priority <= M'}; +unlike ($output, qr/one/, 'ls priority <= H --> !one'); +like ($output, qr/two/, 'ls priority <= H --> two'); +like ($output, qr/three/, 'ls priority <= H --> three'); +like ($output, qr/four/, 'ls priority <= H --> four'); + +$output = qx{../src/task rc:op.rc ls 'description <= t'}; +like ($output, qr/one/, 'ls description <= t --> one'); +unlike ($output, qr/two/, 'ls description <= t --> !two'); +unlike ($output, qr/three/, 'ls description <= t --> !three'); +like ($output, qr/four/, 'ls description <= t --> four'); + +# 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 'op.rc'; +ok (!-r 'op.rc', 'Removed op.rc'); + +exit 0; +