From 15adcfe1a0a5daf8b2fe68d03ad4df634a0fa8fd Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 Oct 2015 10:39:28 -0400
Subject: [PATCH] Test: Merged feature.1061.t into columns.t

---
 test/columns.t      | 20 +++++++++++++++
 test/feature.1061.t | 62 ---------------------------------------------
 2 files changed, 20 insertions(+), 62 deletions(-)
 delete mode 100755 test/feature.1061.t

diff --git a/test/columns.t b/test/columns.t
index b436906da..b22d57d62 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -445,6 +445,26 @@ depends     list*             1 2 10
 start       active*           ✓
         """
 
+class TestFeature1061(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_columns(self):
+        """1061: Verify 'task columns' works"""
+        code, out, err = self.t("columns")
+        self.assertIn("description", out)
+        self.assertIn("uuid", out)
+        self.assertIn("project", out)
+
+    def test_columns_specific(self):
+        """1061: Verify 'task columns escr' works"""
+        code, out, err = self.t("columns escr")
+        self.assertIn("description", out)
+        self.assertNotIn("uuid", out)
+        self.assertNotIn("project", out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/feature.1061.t b/test/feature.1061.t
deleted file mode 100755
index b697040cd..000000000
--- a/test/feature.1061.t
+++ /dev/null
@@ -1,62 +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 TestFeature1061(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-
-    def test_columns(self):
-        """Verify 'task columns' works"""
-        code, out, err = self.t("columns")
-        self.assertIn("description", out)
-        self.assertIn("uuid", out)
-        self.assertIn("project", out)
-
-    def test_columns_specific(self):
-        """Verify 'task columns escr' works"""
-        code, out, err = self.t("columns escr")
-        self.assertIn("description", out)
-        self.assertNotIn("uuid", out)
-        self.assertNotIn("project", out)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python