TW-1687: task add due:som appears to be interpreted as 'someday'

- Thanks to Alan Young.
This commit is contained in:
Paul Beckingham 2015-09-06 15:48:05 -04:00
parent c256096118
commit ff965c95d3
4 changed files with 72 additions and 2 deletions

View file

@ -120,7 +120,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
ribbon ribbon
Daniel Shahaf Daniel Shahaf
Johannes Wienke Johannes Wienke
Harley Pig Alan Young
Thanks to the following, who submitted detailed bug reports and excellent Thanks to the following, who submitted detailed bug reports and excellent
suggestions: suggestions:

View file

@ -140,6 +140,8 @@
- TW-1671 task add: segfault with foo-bar:1 (thanks to Daniel Shahaf). - TW-1671 task add: segfault with foo-bar:1 (thanks to Daniel Shahaf).
- TW-1675 project.not:something doesn't exclude project:something.subprojects - TW-1675 project.not:something doesn't exclude project:something.subprojects
(thanks to Ander). (thanks to Ander).
- TW-1687 task add due:som appears to be interpreted as 'someday' (thanks to
Alan Young).
- Prevent potential task duplication during import for non-pending tasks. - Prevent potential task duplication during import for non-pending tasks.
- Show the active context in "context list", if any is active. - Show the active context in "context list", if any is active.
- Fix "task edit" dropping annotation text after newlines. - Fix "task edit" dropping annotation text after newlines.

View file

@ -25,6 +25,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <cmake.h> #include <cmake.h>
#include <algorithm>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <text.h> #include <text.h>
@ -209,7 +210,7 @@ bool namedDates (const std::string& name, Variant& value)
} }
else if (closeEnough ("later", name, minimum) || else if (closeEnough ("later", name, minimum) ||
closeEnough ("someday", name, minimum)) closeEnough ("someday", name, std::max (minimum, 4)))
{ {
t->tm_hour = t->tm_min = t->tm_sec = 0; t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_year = 138; t->tm_year = 138;

67
test/tw-1687.t Executable file
View file

@ -0,0 +1,67 @@
#!/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
from basetest import Taskd, ServerTestCase
class TestBug1687(TestCase):
def setUp(self):
"""Executed before each test in the class"""
self.t = Task()
def test_som(self):
"""The named date 'som' should take precedence over 'someday', for an exact match"""
self.t("rc.abbreviation.minimum=2 add one due:som")
code, out, err = self.t("_get 1.due.year")
self.assertNotEqual("2038\n", out)
self.t("rc.abbreviation.minimum=3 add two due:som")
code, out, err = self.t("_get 2.due.year")
self.assertNotEqual("2038\n", out)
self.t("rc.abbreviation.minimum=4 add three due:som")
code, out, err = self.t("_get 3.due.year")
self.assertNotEqual("2038\n", out)
self.t("rc.abbreviation.minimum=4 add three due:some")
code, out, err = self.t("_get 4.due.year")
self.assertEqual("2038\n", out)
if __name__ == "__main__":
from simpletap import TAPTestRunner
unittest.main(testRunner=TAPTestRunner())
# vim: ai sts=4 et sw=4 ft=python