From 4e178c8186bcff3708a3ebf7db5ec93a7b63191c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Oct 2015 08:29:51 -0400
Subject: [PATCH] Test: Merged bug.851.t into math.t

---
 test/bug.851.t | 66 --------------------------------------------------
 test/math.t    | 23 ++++++++++++++++++
 2 files changed, 23 insertions(+), 66 deletions(-)
 delete mode 100755 test/bug.851.t

diff --git a/test/bug.851.t b/test/bug.851.t
deleted file mode 100755
index cbb697bce..000000000
--- a/test/bug.851.t
+++ /dev/null
@@ -1,66 +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 TestBugNumber(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        """Executed once before any test in the class"""
-        cls.t = Task()
-        cls.t('add past due:-2days')
-        cls.t('add future due:2days')
-
-    def setUp(self):
-        """Executed before each test in the class"""
-
-    def test_attribute_before_with_math(self):
-        """Test due.before:now+1d"""
-        code, out, err = self.t('due.before:now+1day ls')
-        self.assertIn("past", out)
-        self.assertNotIn("future", out)
-
-    def test_attribute_after_with_math(self):
-        """Test due.after:now+1d"""
-        code, out, err = self.t('due.after:now+1day ls')
-        self.assertNotIn("past", out)
-        self.assertIn("future", out)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/math.t b/test/math.t
index 4158bd628..822608ca2 100755
--- a/test/math.t
+++ b/test/math.t
@@ -84,6 +84,29 @@ class TestMath(TestCase):
         code, out, err = self.t('_get 6.due')
         self.assertEqual(out, self.when)
 
+class TestBug851(TestCase):
+    @classmethod
+    def setUpClass(cls):
+        """Executed once before any test in the class"""
+        cls.t = Task()
+        cls.t('add past due:-2days')
+        cls.t('add future due:2days')
+
+    def setUp(self):
+        """Executed before each test in the class"""
+
+    def test_attribute_before_with_math(self):
+        """851: Test due.before:now+1d"""
+        code, out, err = self.t('due.before:now+1day ls')
+        self.assertIn("past", out)
+        self.assertNotIn("future", out)
+
+    def test_attribute_after_with_math(self):
+        """851: Test due.after:now+1d"""
+        code, out, err = self.t('due.after:now+1day ls')
+        self.assertNotIn("past", out)
+        self.assertIn("future", out)
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner