From 6282b4fcb68aed457a86c9140d8d5ecc513325c9 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 1 Sep 2013 07:21:29 +0100
Subject: [PATCH] Tests and fixed

---
 openlp/core/ui/__init__.py                    |  1 +
 .../tests.formattingcontroller.py             | 28 -----------
 .../tests_fromattingstagsform.py              | 50 -------------------
 3 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100644 tests/functional/openlp_core_ui/tests.formattingcontroller.py
 delete mode 100644 tests/functional/openlp_core_ui/tests_fromattingstagsform.py

diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 4fa7539e4..be44e549c 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -95,6 +95,7 @@ from aboutform import AboutForm
 from pluginform import PluginForm
 from settingsform import SettingsForm
 from formattingtagform import FormattingTagForm
+from formattingtagcontroller import FormattingTagController
 from shortcutlistform import ShortcutListForm
 from mediadockmanager import MediaDockManager
 from servicemanager import ServiceManager
diff --git a/tests/functional/openlp_core_ui/tests.formattingcontroller.py b/tests/functional/openlp_core_ui/tests.formattingcontroller.py
deleted file mode 100644
index 7959e82b5..000000000
--- a/tests/functional/openlp_core_ui/tests.formattingcontroller.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-Package to test the openlp.core.ui.formattingtagscontroller package.
-"""
-from unittest import TestCase
-
-from mock import MagicMock, patch
-
-from openlp.core.ui import FormattingTagController
-
-
-class TestFormattingTagController(TestCase):
-
-    def setUp(self):
-        self.services = FormattingTagController()
-
-    def test_strip(self):
-        """
-        Test that the _strip strips the correct chars
-        """
-
-        # GIVEN: An instance of the Formatting Tag Form and a string containing a tag
-        tag = u'{tag}'
-
-        # WHEN: Calling _strip
-        result = self.services._strip(tag)
-
-        # THEN: The tag should be returned with the wrappers removed.
-        self.assertEqual(result, u'tag', u'FormattingTagForm._strip should return u\'tag\' when called with u\'{tag}\'')
\ No newline at end of file
diff --git a/tests/functional/openlp_core_ui/tests_fromattingstagsform.py b/tests/functional/openlp_core_ui/tests_fromattingstagsform.py
deleted file mode 100644
index 2b31c0a62..000000000
--- a/tests/functional/openlp_core_ui/tests_fromattingstagsform.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
-Package to test the openlp.core.ui.formattingtagsform package.
-"""
-from unittest import TestCase
-
-from mock import MagicMock, patch
-
-from openlp.core.ui.formattingtagform import FormattingTagForm
-
-# TODO: Tests Still TODO
-# __init__
-# exec_
-# on_new_clicked
-# on_delete_clicked
-# on_saved_clicked
-# _reloadTable
-
-
-class TestFormattingTagForm(TestCase):
-
-    def setUp(self):
-        self.init_patcher = patch(u'openlp.core.ui.formattingtagform.FormattingTagForm.__init__')
-        self.qdialog_patcher = patch(u'openlp.core.ui.formattingtagform.QtGui.QDialog')
-        self.ui_formatting_tag_dialog_patcher = patch(u'openlp.core.ui.formattingtagform.Ui_FormattingTagDialog')
-        self.mocked_init = self.init_patcher.start()
-        self.mocked_qdialog = self.qdialog_patcher.start()
-        self.mocked_ui_formatting_tag_dialog = self.ui_formatting_tag_dialog_patcher.start()
-        self.mocked_init.return_value = None
-
-    def tearDown(self):
-        self.init_patcher.stop()
-        self.qdialog_patcher.stop()
-        self.ui_formatting_tag_dialog_patcher.stop()
-
-    def test_on_text_edited(self):
-        """
-        Test that the appropriate actions are preformed when on_text_edited is called
-        """
-
-        # GIVEN: An instance of the Formatting Tag Form and a mocked save_push_button
-        form = FormattingTagForm()
-        form.save_push_button = MagicMock()
-
-        # WHEN: on_text_edited is called with an arbitrary value
-        form.on_text_edited(u'text')
-
-        # THEN: setEnabled and setDefault should have been called on save_push_button
-        form.save_push_button.setEnabled.assert_called_with(True)
-        form.save_push_button.setDefault.assert_called_with(True)
-