From ab73a93fd679dab34d66e718485c266dd53404d1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Oct 2015 09:00:21 -0400
Subject: [PATCH] Test: Merged bug.annotate.t into annotate.t

---
 test/annotate.t     | 32 ++++++++++++++++++++
 test/bug.annotate.t | 74 ---------------------------------------------
 2 files changed, 32 insertions(+), 74 deletions(-)
 delete mode 100755 test/bug.annotate.t

diff --git a/test/annotate.t b/test/annotate.t
index 26ee57018..154ca2e4b 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -149,6 +149,38 @@ class TestAnnotationPropagation(TestCase):
         code, out, err = self.t("_get 2.annotations.1.description")
         self.assertEqual("bar\n", out)
 
+
+class TestAnnotation(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+        self.t.config("confirmation", "yes")
+
+    def test_blank_annotation(self):
+        """Verify blank annotations are prevented"""
+        self.t("add foo")
+
+        code, out, err = self.t.runError("1 annotate")
+        self.assertIn("Additional text must be provided", err)
+
+    def test_filterless_annotate_decline(self):
+        """Verify filterless annotation is trapped, declined"""
+        self.t("add foo")
+
+        code, out, err = self.t.runError("annotate bar", input="no\n")
+        self.assertIn("Command prevented from running", err)
+        self.assertNotIn("Command prevented from running", out)
+
+    def test_filterless_annotate(self):
+        """Verify filterless annotation is trapped, overridden"""
+        self.t("add foo")
+        code, out, err = self.t("annotate bar", input="yes\n")
+
+        self.assertNotIn("Command prevented from running", err)
+        self.assertNotIn("Command prevented from running", out)
+        self.assertIn("Annotated 1 task", out)
+
+
 class TestBug495(TestCase):
     def setUp(self):
         self.t = Task()
diff --git a/test/bug.annotate.t b/test/bug.annotate.t
deleted file mode 100755
index 7a3a1baaa..000000000
--- a/test/bug.annotate.t
+++ /dev/null
@@ -1,74 +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 TestAnnotation(TestCase):
-
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-        self.t.config("confirmation", "yes")
-
-    def test_blank_annotation(self):
-        """Verify blank annotations are prevented"""
-        self.t("add foo")
-
-        code, out, err = self.t.runError("1 annotate")
-        self.assertIn("Additional text must be provided", err)
-
-    def test_filterless_annotate_decline(self):
-        """Verify filterless annotation is trapped, declined"""
-        self.t("add foo")
-
-        code, out, err = self.t.runError("annotate bar", input="no\n")
-        self.assertIn("Command prevented from running", err)
-        self.assertNotIn("Command prevented from running", out)
-
-    def test_filterless_annotate(self):
-        """Verify filterless annotation is trapped, overridden"""
-        self.t("add foo")
-        code, out, err = self.t("annotate bar", input="yes\n")
-
-        self.assertNotIn("Command prevented from running", err)
-        self.assertNotIn("Command prevented from running", out)
-        self.assertIn("Annotated 1 task", out)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python