From d7b59156524a364802f0b9961123604b7ec935db Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 16 Jul 2015 16:34:39 -0400
Subject: [PATCH] TW-1622: Duration UDA can't take an algebraic expression

- Thanks to Jeremy John Reeder.
---
 ChangeLog      |  2 ++
 test/tw-1622.t | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100755 test/tw-1622.t

diff --git a/ChangeLog b/ChangeLog
index 18b22c4f3..99caecd8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,8 @@
           (thanks to Denis Kasak).
 - TW-1615 Japanese translation for Taskwarrior(150513) (thanks to ribbon).
 - TW-1617 Can't search for multi-word project (thanks to Audrey Easterday).
+- TW-1622 Duration UDA can't take an algebraic expression (thanks to Jeremy John
+          Reeder).
 - TW-1626 Wrong wait date (thanks to Andrea Rizzi).
 - TW-1632 Japanese translation for Taskwarrior(150713) (thanks to ribbon).
 - Prevent potential task duplication during import for non-pending tasks.
diff --git a/test/tw-1622.t b/test/tw-1622.t
new file mode 100755
index 000000000..4178d42fe
--- /dev/null
+++ b/test/tw-1622.t
@@ -0,0 +1,56 @@
+#!/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 TestBug1622(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_uda_duration_expression(self):
+        """Verify that a UDA of type 'duration' accepts an expression"""
+        self.t.config("uda.dur.type", "duration")
+        self.t("add Run 3 miles dur:33min+18s")
+
+        code, out, err = self.t("_get 1.dur")
+        self.assertEqual("PT33M18S\n", out)
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4