From 5859b2d54aa4afadb4f65cbe322ec74585690a38 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 25 Oct 2015 11:54:16 -0400 Subject: [PATCH] Test: Merged tw-1634.t into filter.t --- test/filter.t | 46 ++++++++++++++++++++++++++ test/tw-1634.t | 88 -------------------------------------------------- 2 files changed, 46 insertions(+), 88 deletions(-) delete mode 100755 test/tw-1634.t diff --git a/test/filter.t b/test/filter.t index 1d0105609..90e41b285 100755 --- a/test/filter.t +++ b/test/filter.t @@ -989,6 +989,52 @@ class TestBug1630(TestCase): self.assertNotIn("two", out) +class Test1634(TestCase): + def setUp(self): + self.t = Task() + + # Setup some tasks due on 2015-07-07 + self.t('add due:2015-07-07T00:00:00 ON1') + self.t('add due:2015-07-07T14:34:56 ON2') + self.t('add due:2015-07-07T23:59:59 ON3') + + # Setup some tasks not due on 2015-07-07 + self.t('add due:2015-07-06T23:59:59 OFF4') + self.t('add due:2015-07-08T00:00:00 OFF5') + self.t('add due:2015-07-08T00:00:01 OFF6') + self.t('add due:2015-07-06T00:00:00 OFF7') + + def test_due_match_not_exact(self): + """1634: Test that due: matches any task that date.""" + code, out, err = self.t('due:2015-07-07 minimal') + + # Asswer that only tasks ON the date are listed. + self.assertIn("ON1", out) + self.assertIn("ON2", out) + self.assertIn("ON3", out) + + # Assert that tasks on other dates are not listed. + self.assertNotIn("OFF4", out) + self.assertNotIn("OFF5", out) + self.assertNotIn("OFF6", out) + self.assertNotIn("OFF7", out) + + def test_due_not_match_not_exact(self): + """1634: Test that due.not: does not match any task that date.""" + code, out, err = self.t('due.not:2015-07-07 minimal') + + # Assert that task ON the date are not listed. + self.assertNotIn("ON1", out) + self.assertNotIn("ON2", out) + self.assertNotIn("ON3", out) + + # Assert that tasks on other dates are listed. + self.assertIn("OFF4", out) + self.assertIn("OFF5", out) + self.assertIn("OFF6", out) + self.assertIn("OFF7", out) + + if __name__ == "__main__": from simpletap import TAPTestRunner unittest.main(testRunner=TAPTestRunner()) diff --git a/test/tw-1634.t b/test/tw-1634.t deleted file mode 100755 index 297d01d19..000000000 --- a/test/tw-1634.t +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env python2.7 -# -*- coding: utf-8 -*- -################################################################################ -## -## 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 -## -################################################################################ - -import sys -import os -import unittest - -# Ensure python finds the local simpletap module -sys.path.append(os.path.dirname(os.path.abspath(__file__))) - -from basetest import Task, TestCase - -class Test1634(TestCase): - def setUp(self): - self.t = Task() - - # Setup some tasks due on 2015-07-07 - self.t('add due:2015-07-07T00:00:00 ON1') - self.t('add due:2015-07-07T14:34:56 ON2') - self.t('add due:2015-07-07T23:59:59 ON3') - - # Setup some tasks not due on 2015-07-07 - self.t('add due:2015-07-06T23:59:59 OFF4') - self.t('add due:2015-07-08T00:00:00 OFF5') - self.t('add due:2015-07-08T00:00:01 OFF6') - self.t('add due:2015-07-06T00:00:00 OFF7') - - def test_due_match_not_exact(self): - """Test that due: matches any task that date.""" - code, out, err = self.t('due:2015-07-07 minimal') - - # Asswer that only tasks ON the date are listed. - self.assertIn("ON1", out) - self.assertIn("ON2", out) - self.assertIn("ON3", out) - - # Assert that tasks on other dates are not listed. - self.assertNotIn("OFF4", out) - self.assertNotIn("OFF5", out) - self.assertNotIn("OFF6", out) - self.assertNotIn("OFF7", out) - - def test_due_not_match_not_exact(self): - """Test that due.not: does not match any task that date.""" - code, out, err = self.t('due.not:2015-07-07 minimal') - - # Assert that task ON the date are not listed. - self.assertNotIn("ON1", out) - self.assertNotIn("ON2", out) - self.assertNotIn("ON3", out) - - # Assert that tasks on other dates are listed. - self.assertIn("OFF4", out) - self.assertIn("OFF5", out) - self.assertIn("OFF6", out) - self.assertIn("OFF7", out) - - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4 ft=python