From 01526e298c65121c0811c7b12a495571355a3d32 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 25 Oct 2015 11:49:51 -0400
Subject: [PATCH] =?UTF-8?q?Test:=20Merged=20tw=E2=80=901622.t=20into=20uda?=
 =?UTF-8?q?.t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/tw-1622.t | 56 --------------------------------------------------
 test/uda.t     | 14 +++++++++++++
 2 files changed, 14 insertions(+), 56 deletions(-)
 delete mode 100755 test/tw-1622.t

diff --git a/test/tw-1622.t b/test/tw-1622.t
deleted file mode 100755
index 79b1adc36..000000000
--- a/test/tw-1622.t
+++ /dev/null
@@ -1,56 +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 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 ft=python
diff --git a/test/uda.t b/test/uda.t
index b27f8ba08..520e3009e 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -328,6 +328,20 @@ class Test1542(TestCase):
         self.assertIn("\"bugid\":43.21", out)
 
 
+class TestBug1622(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_uda_duration_expression(self):
+        """1622: 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())