From b9bbc83302302b7ee5462ba5e0a7ab83582d75f0 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Oct 2015 07:06:31 -0400
Subject: [PATCH] Test: Merged bug.425.t into info.t

---
 test/bug.425.t | 55 --------------------------------------------------
 test/info.t    | 12 +++++++++++
 2 files changed, 12 insertions(+), 55 deletions(-)
 delete mode 100755 test/bug.425.t

diff --git a/test/bug.425.t b/test/bug.425.t
deleted file mode 100755
index 327fbd915..000000000
--- a/test/bug.425.t
+++ /dev/null
@@ -1,55 +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 TestBug425(TestCase):
-    def setUp(self):
-        self.t = Task()
-
-    def test_bug425(self):
-        """parser interpret 'in' in description"""
-        self.t("add Foo")
-        self.t("1 modify Bar in Bar")
-
-        code, out, err = self.t("1 ls")
-        self.assertRegexpMatches(out, "1\s+Bar in Bar")
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/info.t b/test/info.t
index 52e9bd552..49adb4109 100755
--- a/test/info.t
+++ b/test/info.t
@@ -87,6 +87,18 @@ class TestInfoCommand(TestCase):
         self.assertIn("due", out)
         self.assertIn("UDA priority.H", out)
 
+class TestBug425(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_bug425(self):
+        """Make sure parser sees 'in' and not an abbreviated 'info'"""
+        self.t("add Foo")
+        self.t("1 modify Bar in Bar")
+
+        code, out, err = self.t("1 ls")
+        self.assertRegexpMatches(out, "1\s+Bar in Bar")
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner