From 32960d5e17ef88899744ac2e51dc8a65bec090ca Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 Oct 2015 10:10:11 -0400
Subject: [PATCH] Test: Merged tw-1300.t into dom.t

---
 test/dependencies.t |  6 ++---
 test/dom.t          | 17 +++++++++++++
 test/tw-1300.t      | 58 ---------------------------------------------
 3 files changed, 20 insertions(+), 61 deletions(-)
 delete mode 100755 test/tw-1300.t

diff --git a/test/dependencies.t b/test/dependencies.t
index 2e62de9f8..592be8638 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -244,7 +244,7 @@ class TestBug1262(TestCase):
         cls.t("add dep:" + ",".join(cls.DEPS) + '"Make fruit salad!"')
 
     def test_dependency_contains_matches_ID(self):
-        """dep.contains matches task IDs"""
+        """1262: dep.contains matches task IDs"""
         # NOTE: A more robust test is needed as alternative to this
         # If it happens that the UUID doesn't contain a 1 nor a 2 the test will
         # fail, which means it's actually using the UUID.
@@ -253,12 +253,12 @@ class TestBug1262(TestCase):
             self.t("list dep.contains:{0}".format(char))
 
     def test_dependency_contains_not_matches_other(self):
-        """dep.contains matches other characters not present in ID nor UUID"""
+        """1262: dep.contains matches other characters not present in ID nor UUID"""
         for char in set(string.letters).difference(string.hexdigits):
             self.t.runError("list dep.contains:{0}".format(char))
 
     def test_dependency_contains_not_UUID(self):
-        """dep.contains matches characters in the tasks' UUIDs"""
+        """1262: dep.contains matches characters in the tasks' UUIDs"""
         # Get the UUID of the task with description "Buy"
         code, out, err = self.t("uuid Buy")
 
diff --git a/test/dom.t b/test/dom.t
index ff2fdffbf..190d7b56c 100755
--- a/test/dom.t
+++ b/test/dom.t
@@ -431,6 +431,23 @@ class TestDOMDirectReferencesFiltering(TestCase):
         result = self.t.export_one("ticketest:1.ticketest")
         self.assertEqual("matching task", result['description'])
 
+
+class TestBug1300(TestCase):
+    @classmethod
+    def setUp(cls):
+        cls.t = Task()
+
+    def test_dom_exit_status_good(self):
+        """1300: If the DOM recognizes a reference, it should return '0'
+        """
+        self.t("_get context.program")
+
+    def test_dom_exit_status_bad(self):
+        """1300: If the DOM does not recognize a reference, it should return '1'
+        """
+        self.t.runError("_get XYZ")
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/tw-1300.t b/test/tw-1300.t
deleted file mode 100755
index da005b399..000000000
--- a/test/tw-1300.t
+++ /dev/null
@@ -1,58 +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 and basetest modules
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from basetest import Task, TestCase
-
-
-class TestBug1300(TestCase):
-    @classmethod
-    def setUp(cls):
-        cls.t = Task()
-
-    def test_dom_exit_status_good(self):
-        """If the DOM recognizes a reference, it should return '0'
-        """
-        self.t("_get context.program")
-
-    def test_dom_exit_status_bad(self):
-        """If the DOM does not recognize a reference, it should return '1'
-        """
-        self.t.runError("_get XYZ")
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python