From e15bcc004c914f7966ee44b2cbdbd67088a0bb43 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 Oct 2015 11:05:55 -0400
Subject: [PATCH] Test: Merged tw-1430.t into project.t

---
 test/project.t | 17 ++++++++++++++
 test/tw-1430.t | 60 --------------------------------------------------
 2 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100755 test/tw-1430.t

diff --git a/test/project.t b/test/project.t
index 71c48ae33..2692549c4 100755
--- a/test/project.t
+++ b/test/project.t
@@ -436,6 +436,23 @@ class TestBug1267(TestCase):
         self.assertNotIn(project, out)
 
 
+class TestBug1430(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_project_names_with_dots(self):
+        """1430: Check that filtering works for project names with dots"""
+        self.t("add foo project:home.garden")
+        code, out, err = self.t("_get 1.project")
+        self.assertEqual("home.garden\n", out)
+
+    def test_project_names_with_slashes(self):
+        """1430: Check that filtering works for project names with slashes"""
+        self.t("add foo project:home/garden")
+        code, out, err = self.t("_get 1.project")
+        self.assertEqual("home/garden\n", out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/tw-1430.t b/test/tw-1430.t
deleted file mode 100755
index b1e1163d8..000000000
--- a/test/tw-1430.t
+++ /dev/null
@@ -1,60 +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 TestBug1430(TestCase):
-    def setUp(self):
-        self.t = Task()
-
-    def test_project_names_with_dots(self):
-        """Check that filtering works for project names with dots"""
-        self.t("add foo project:home.garden")
-        code, out, err = self.t("_get 1.project")
-        self.assertEqual("home.garden\n", out)
-
-    def test_project_names_with_slashes(self):
-        """Check that filtering works for project names with slashes"""
-        self.t("add foo project:home/garden")
-        code, out, err = self.t("_get 1.project")
-        self.assertEqual("home/garden\n", out)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python