From 2c4a084cb073bc99741a9dbe2ce3f96ea0a135f4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Oct 2015 08:28:11 -0400
Subject: [PATCH] Test: Merged bug.839.t into recurrence.t

---
 test/bug.839.t    | 57 -----------------------------------------------
 test/recurrence.t | 16 ++++++++++++-
 2 files changed, 15 insertions(+), 58 deletions(-)
 delete mode 100755 test/bug.839.t

diff --git a/test/bug.839.t b/test/bug.839.t
deleted file mode 100755
index d50373d2b..000000000
--- a/test/bug.839.t
+++ /dev/null
@@ -1,57 +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 TestBug839(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-
-    def test_recurrence_value_mapping(self):
-        """Verify that importing a legacy recurrence value is ok"""
-        json = '{"description":"one","due":"1437579505","recur":"1m","status":"recurring","uuid":"ebeeab00-ccf8-464b-8b58-f7f2d606edfb"}'
-        self.t("import -", input=json)
-
-        code, out, err = self.t("list")
-        self.assertIn("one", out)
-        self.assertNotIn("The recurrence value '1m' is not valid.", 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/recurrence.t b/test/recurrence.t
index ad109ed22..f685a6441 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -211,7 +211,7 @@ class TestRecurrenceTasks(TestCase):
 
 class TestBug972(TestCase):
     def setUp(self):
-        """Executed before each test in the class"""
+        """972: Executed before each test in the class"""
         self.t = Task()
 
     def test_interpretation_of_seven(self):
@@ -503,6 +503,20 @@ class TestBugC001(TestCase):
         code, out, err = self.t("add two due:tomorrow recur:daily")
         self.assertIn("Created task 2.", out)
 
+class TestBug839(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_recurrence_value_mapping(self):
+        """839: Verify that importing a legacy recurrence value is ok"""
+        json = '{"description":"one","due":"1437579505","recur":"1m","status":"recurring","uuid":"ebeeab00-ccf8-464b-8b58-f7f2d606edfb"}'
+        self.t("import -", input=json)
+
+        code, out, err = self.t("list")
+        self.assertIn("one", out)
+        self.assertNotIn("The recurrence value '1m' is not valid.", out)
+
 
 # TODO Wait a recurring task
 # TODO Downgrade a recurring task to a regular task