From 18652a834d0cb3949ef0df0fe19343c206c2ab63 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 Oct 2015 10:18:25 -0400
Subject: [PATCH] Test: Merged feature.891.t into uuid.t

---
 test/feature.891.t | 69 ----------------------------------------------
 test/uuid.t        | 29 +++++++++++++++++++
 2 files changed, 29 insertions(+), 69 deletions(-)
 delete mode 100755 test/feature.891.t

diff --git a/test/feature.891.t b/test/feature.891.t
deleted file mode 100755
index a200d9d5a..000000000
--- a/test/feature.891.t
+++ /dev/null
@@ -1,69 +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 TestFeature891(TestCase):
-    @classmethod
-    def setUp(self):
-        self.t = Task()
-        self.t("add one")
-        self.t("add two")
-
-        # Sometimes this test fails because the 1.uuid starts with N hex digits
-        # such that those digits are all in the range [0-9], and therefore the
-        # UUID looks like an integer.
-        #
-        # The only solution that comes to mind is to repeat self.t("add one")
-        # until 1.uuid contains at least one [a-f] in the first N digits.
-
-        code, self.uuid, err = self.t("_get 1.uuid")
-        self.uuid = self.uuid.strip()
-
-    def test_uuid_filter(self):
-        for i in range(35,7,-1):
-            code, out, err = self.t(self.uuid[0:i] + " list")
-            self.assertIn("one", out)
-            self.assertNotIn("two", out)
-
-        # TODO This should fail because a 7-character UUID is not a UUID, but
-        #      instead it blindly does nothing, and succeeds. Voodoo.
-        #code, out, err = self.t(self.uuid[0:6] + " list")
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/uuid.t b/test/uuid.t
index 1bcf481db..33f96466e 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -215,6 +215,35 @@ class TestBug954(TestCase):
         self.assertIn("No tasks specified.", err)
 
 
+class TestFeature891(TestCase):
+    @classmethod
+    def setUp(self):
+        self.t = Task()
+        self.t("add one")
+        self.t("add two")
+
+        # Sometimes this test fails because the 1.uuid starts with N hex digits
+        # such that those digits are all in the range [0-9], and therefore the
+        # UUID looks like an integer.
+        #
+        # The only solution that comes to mind is to repeat self.t("add one")
+        # until 1.uuid contains at least one [a-f] in the first N digits.
+
+        code, self.uuid, err = self.t("_get 1.uuid")
+        self.uuid = self.uuid.strip()
+
+    def test_uuid_filter(self):
+        """891: Test that a task is addressable using UUIDs of length 7 - 36"""
+        for i in range(35,7,-1):
+            code, out, err = self.t(self.uuid[0:i] + " list")
+            self.assertIn("one", out)
+            self.assertNotIn("two", out)
+
+        # TODO This should fail because a 7-character UUID is not a UUID, but
+        #      instead it blindly does nothing, and succeeds. Voodoo.
+        #code, out, err = self.t(self.uuid[0:6] + " list")
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())