From 205a2bd984a6ae8080de905847479ddd9a3bc7a9 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 Oct 2015 10:33:23 -0400
Subject: [PATCH] Test: Merged feature.725.t into dependencies.t

---
 test/dependencies.t | 27 ++++++++++++++++++
 test/feature.725.t  | 69 ---------------------------------------------
 2 files changed, 27 insertions(+), 69 deletions(-)
 delete mode 100755 test/feature.725.t

diff --git a/test/dependencies.t b/test/dependencies.t
index 592be8638..9756005ca 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -270,6 +270,33 @@ class TestBug1262(TestCase):
                 self.t.runError("list dep.contains:{0}".format(char))
 
 
+class TestFeature725(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_unbocked_feedback(self):
+        """725: Verify that when a task becomes unblocked, feedback is generated"""
+        self.t("add one")
+        self.t("add two")
+        self.t("add three")
+        self.t("add four")
+        self.t("1 modify depends:2,3")
+        self.t("4 modify depends:1")
+
+        # 2 does not unblock 1.
+        code, out, err = self.t("2 done")
+        self.assertNotIn("Unblocked", out)
+
+        # 2 and 3 do unblock 1.
+        code, out, err = self.t("3 done")
+        self.assertIn("Unblocked", out)
+
+        # 1 does unblock 4.
+        code, out, er = self.t("1 delete", input="y\n")
+        self.assertIn("Unblocked", out)
+
+
 # TODO - test dependency.confirmation config variable
 # TODO - test undo on backing out chain gap repair
 # TODO - test undo on backing out choice to not perform chain gap repair
diff --git a/test/feature.725.t b/test/feature.725.t
deleted file mode 100755
index 613b28c6d..000000000
--- a/test/feature.725.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 TestFeature725(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-
-    def test_unbocked_feedback(self):
-        """Verify that when a task becomes unblocked, feedback is generated"""
-        self.t("add one")
-        self.t("add two")
-        self.t("add three")
-        self.t("add four")
-        self.t("1 modify depends:2,3")
-        self.t("4 modify depends:1")
-
-        # 2 does not unblock 1.
-        code, out, err = self.t("2 done")
-        self.assertNotIn("Unblocked", out)
-
-        # 2 and 3 do unblock 1.
-        code, out, err = self.t("3 done")
-        self.assertIn("Unblocked", out)
-
-        # 1 does unblock 4.
-        code, out, er = self.t("1 delete", input="y\n")
-        self.assertIn("Unblocked", out)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python