diff --git a/test/annotate.t b/test/annotate.t index 8d2acf7d1..42b27e5f2 100755 --- a/test/annotate.t +++ b/test/annotate.t @@ -142,6 +142,20 @@ class TestBug495(TestCase): code, out, err = self.t("_get 1.annotations.1.description") self.assertEqual("This is -- a -- test\n", out) +class TestBug694(TestCase): + def setUp(self): + self.t = Task() + + def test_annotation_with_due(self): + """Add an annotation as well as a due date""" + self.t("add one") + self.t("1 annotate two due:today") + + code, out, err = self.t("rc.journal.info:off 1 info") + self.assertIn("one", out) + self.assertIn("two", out) + self.assertIn("Due", out) + if __name__ == "__main__": from simpletap import TAPTestRunner diff --git a/test/bug.694.t b/test/bug.694.t deleted file mode 100755 index a51c9f4e5..000000000 --- a/test/bug.694.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 => 3; - -# 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"; - close $fh; -} - -# Bug 694: Potential bug for "due" and "annotate" - -# Setup: Add a tasks, annotate with long word. -qx{../src/task rc:$rc add One 2>&1}; -qx{../src/task rc:$rc 1 annotate foo due:today 2>&1}; - -# List with rc.hyphenate=on. -my $output = qx{../src/task rc:$rc 1 info 2>&1}; -like ($output, qr/One/, "$ut: found One"); -like ($output, qr/foo/, "$ut: found foo"); -like ($output, qr/Due/, "$ut: found Due"); - -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data), $rc; -exit 0; -