From eb8a91cec6dc33c2b91044026377e61232bc55d2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Oct 2015 08:50:18 -0400
Subject: [PATCH] Test: Merged bug.1031.t into alias.t

---
 test/alias.t    | 35 ++++++++++++++++++++++-
 test/bug.1031.t | 75 -------------------------------------------------
 2 files changed, 34 insertions(+), 76 deletions(-)
 delete mode 100755 test/bug.1031.t

diff --git a/test/alias.t b/test/alias.t
index ebe941b97..ce72ad605 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -149,13 +149,46 @@ class TestBug1652(TestCase):
         self.t("add one")
 
     def test_odd_alias(self):
-        """Verify that 'delete' is not lexed further"""
+        """1652: Verify that 'delete' is not lexed further"""
         self.t.config("alias.rm", "delete")
         self.t.config("confirmation", "off")
         code, out, err = self.t("1 rm")
         self.assertIn("Deleted 1 task.", out)
         self.assertNotIn("No matches.", err)
 
+class TestBug1031(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        # Used to initialize objects that should be re-initialized or
+        # re-created for each individual test
+        self.t = Task()
+
+        self.t.config("alias.from", "to")
+
+    def test_alias_to(self):
+        """1031: alias working as expected: 'from' -> 'to'"""
+        self.t("add from")
+        code, out, err = self.t("1 info")
+
+        expected = "Description\s+to"
+        self.assertRegexpMatches(out, expected)
+
+    def test_alias_to_to(self):
+        """1031: alias working as expected: 'from -- to' -> 'to to'"""
+        self.t("add from -- to")
+        code, out, err = self.t("1 info")
+
+        expected = "Description\s+to to"
+        self.assertRegexpMatches(out, expected)
+
+    def test_alias_to_from(self):
+        """1031: alias working as expected: 'to -- from' -> 'to from'"""
+        self.t("add to -- from")
+        code, out, err = self.t("1 info")
+
+        expected = "Description\s+to from"
+        self.assertRegexpMatches(out, expected)
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
diff --git a/test/bug.1031.t b/test/bug.1031.t
deleted file mode 100755
index fcc7c1902..000000000
--- a/test/bug.1031.t
+++ /dev/null
@@ -1,75 +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 TestBug1031(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        # Used to initialize objects that should be re-initialized or
-        # re-created for each individual test
-        self.t = Task()
-
-        self.t.config("alias.from", "to")
-
-    def test_alias_to(self):
-        """alias working as expected: 'from' -> 'to'"""
-        self.t("add from")
-        code, out, err = self.t("1 info")
-
-        expected = "Description\s+to"
-        self.assertRegexpMatches(out, expected)
-
-    def test_alias_to_to(self):
-        """alias working as expected: 'from -- to' -> 'to to'"""
-        self.t("add from -- to")
-        code, out, err = self.t("1 info")
-
-        expected = "Description\s+to to"
-        self.assertRegexpMatches(out, expected)
-
-    def test_alias_to_from(self):
-        """alias working as expected: 'to -- from' -> 'to from'"""
-        self.t("add to -- from")
-        code, out, err = self.t("1 info")
-
-        expected = "Description\s+to from"
-        self.assertRegexpMatches(out, expected)
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python