From ce0bea73e53f0847b829a0754a036e7f609c03e7 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 Oct 2015 11:13:08 -0400
Subject: [PATCH] Test: Merged tw-1445.t into alias.t

---
 test/alias.t   | 22 +++++++++++++++++
 test/tw-1445.t | 64 --------------------------------------------------
 2 files changed, 22 insertions(+), 64 deletions(-)
 delete mode 100755 test/tw-1445.t

diff --git a/test/alias.t b/test/alias.t
index ce72ad605..2c721f6a6 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -29,6 +29,7 @@
 import sys
 import os
 import unittest
+from datetime import datetime
 # Ensure python finds the local simpletap module
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
@@ -190,6 +191,27 @@ class TestBug1031(TestCase):
         self.assertRegexpMatches(out, expected)
 
 
+class Test1445(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_alias_single_word(self):
+        """1445: Verify single-word aliases"""
+        self.t.config('alias.when', 'execute date')
+        code, out, err = self.t('when')
+        self.assertEqual(0, code, "Exit code was non-zero ({0})".format(code))
+        self.assertIn(str(datetime.now().year), out)
+
+    def test_alias_multi_word(self):
+        """1445: Verify multi-word aliases"""
+        self.t.config('alias.worktasks', 'list +work')
+        self.t('add one +work')
+        self.t('add two')
+        code, out, err = self.t('worktasks')
+        self.assertEqual(0, code, "Exit code was non-zero ({0})".format(code))
+        self.assertIn('one', out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/tw-1445.t b/test/tw-1445.t
deleted file mode 100755
index 845184606..000000000
--- a/test/tw-1445.t
+++ /dev/null
@@ -1,64 +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
-from datetime import datetime
-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 Test1445(TestCase):
-    def setUp(self):
-        self.t = Task()
-
-    def test_alias_single_word(self):
-        """Verify single-word aliases"""
-        self.t.config('alias.when', 'execute date')
-        code, out, err = self.t('when')
-        self.assertEqual(0, code, "Exit code was non-zero ({0})".format(code))
-        self.assertIn(str(datetime.now().year), out)
-
-    def test_alias_multi_word(self):
-        """Verify multi-word aliases"""
-        self.t.config('alias.worktasks', 'list +work')
-        self.t('add one +work')
-        self.t('add two')
-        code, out, err = self.t('worktasks')
-        self.assertEqual(0, code, "Exit code was non-zero ({0})".format(code))
-        self.assertIn('one', out)
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python