From 44737f91e9027ff7ff9ac1bfc635111b1fd6cabe Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 Oct 2015 11:18:47 -0400
Subject: [PATCH] Test: Merged tw-1452.t into filter.t

---
 test/filter.t  | 23 +++++++++++++++++
 test/tw-1452.t | 68 --------------------------------------------------
 2 files changed, 23 insertions(+), 68 deletions(-)
 delete mode 100755 test/tw-1452.t

diff --git a/test/filter.t b/test/filter.t
index 17958d8b0..c515b6c51 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -865,6 +865,29 @@ class Test1424(TestCase):
         self.assertEqual(out, "%d\n" % (plus_3648d.year))
 
 
+# TODO This does not look right, it adds one task, exports it, and checks the UUID.
+#      The 'uuid:' filter could be ignored, and this test might pass.
+class Test1452(TestCase):
+    def setUp(self):
+        self.t = Task()
+        self.t('add task')
+        self.task_uuid = self.t.export_one()['uuid']
+
+    def test_get_task_by_uuid_with_prefix(self):
+        """1452: Tries to filter task simply by it's uuid, using uuid: prefix."""
+        output = self.t.export_one('uuid:%s' % self.task_uuid)
+
+        # Sanity check it is the correct one
+        self.assertEqual(output['uuid'], self.task_uuid)
+
+    def test_get_task_by_uuid_without_prefix(self):
+        """1452: Tries to filter task simply by it's uuid, without using uuid: prefix."""
+        output = self.t.export_one(self.task_uuid)
+
+        # Sanity check it is the correct one
+        self.assertEqual(output['uuid'], self.task_uuid)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/tw-1452.t b/test/tw-1452.t
deleted file mode 100755
index 5d8890251..000000000
--- a/test/tw-1452.t
+++ /dev/null
@@ -1,68 +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 json
-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 Test1452(TestCase):
-    def setUp(self):
-        self.t = Task()
-        self.t('add task')
-        self.task_uuid = self.t.export_one()['uuid']
-
-    def test_get_task_by_uuid_with_prefix(self):
-        """Tries to filter task simply by it's uuid, using uuid: prefix."""
-
-        # Load task
-        output = self.t.export_one('uuid:%s' % self.task_uuid)
-
-        # Sanity check it is the correct one
-        self.assertEqual(output['uuid'], self.task_uuid)
-
-    def test_get_task_by_uuid_without_prefix(self):
-        """Tries to filter task simply by it's uuid, without using uuid: prefix."""
-
-        # Load task
-        output = self.t.export_one(self.task_uuid)
-
-        # Sanity check it is the correct one
-        self.assertEqual(output['uuid'], self.task_uuid)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python