Merge lp:~phill-ridout/openlp/bug1623711-2.4 into lp:openlp/2.4

[Phill]

lp:~phill-ridout/openlp/bug1623711-2.4 (revision 2653)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1810/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1721/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1659/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1415/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1005/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1073/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/941/

[Tim Bentley (trb143)]

review: Approve

[Tomas Groth (tomasgroth)]

review: Approve

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2015-12-31 22:46:06 +0000
+++ openlp/plugins/bibles/lib/manager.py	2016-11-01 20:24:24 +0000
@@ -126,7 +126,7 @@
             name = bible.get_name()
             # Remove corrupted files.
             if name is None:
-                bible.session.close()
+                bible.session.close_all()
                 delete_file(os.path.join(self.path, filename))
                 continue
             log.debug('Bible Name: "%s"', name)
@@ -173,7 +173,7 @@
         """
         log.debug('BibleManager.delete_bible("%s")', name)
         bible = self.db_cache[name]
-        bible.session.close()
+        bible.session.close_all()
         bible.session = None
         return delete_file(os.path.join(bible.path, bible.file))
 
 
=== added file 'tests/functional/openlp_plugins/bibles/test_manager.py'
--- tests/functional/openlp_plugins/bibles/test_manager.py	1970-01-01 00:00:00 +0000
+++ tests/functional/openlp_plugins/bibles/test_manager.py	2016-11-01 20:24:24 +0000
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2016 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+This module contains tests for the manager submodule of the Bibles plugin.
+"""
+from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+from openlp.plugins.bibles.lib.manager import BibleManager
+
+
+class TestManager(TestCase):
+    """
+    Test the functions in the :mod:`manager` module.
+    """
+
+    def setUp(self):
+        app_location_patcher = patch('openlp.plugins.bibles.lib.manager.AppLocation')
+        self.addCleanup(app_location_patcher.stop)
+        app_location_patcher.start()
+        log_patcher = patch('openlp.plugins.bibles.lib.manager.log')
+        self.addCleanup(log_patcher.stop)
+        self.mocked_log = log_patcher.start()
+        settings_patcher = patch('openlp.plugins.bibles.lib.manager.Settings')
+        self.addCleanup(settings_patcher.stop)
+        settings_patcher.start()
+
+    def test_delete_bible(self):
+        """
+        Test the BibleManager delete_bible method
+        """
+        # GIVEN: An instance of BibleManager and a mocked bible
+        with patch.object(BibleManager, 'reload_bibles'), \
+                patch('openlp.plugins.bibles.lib.manager.os.path.join', side_effect=lambda x, y: '{}/{}'.format(x, y)),\
+                patch('openlp.plugins.bibles.lib.manager.delete_file', return_value=True) as mocked_delete_file:
+            instance = BibleManager(MagicMock())
+            # We need to keep a reference to the mock for close_all as it gets set to None later on!
+            mocked_close_all = MagicMock()
+            mocked_bible = MagicMock(file='KJV.sqlite', path='bibles', **{'session.close_all': mocked_close_all})
+            instance.db_cache = {'KJV': mocked_bible}
+
+            # WHEN: Calling delete_bible with 'KJV'
+            result = instance.delete_bible('KJV')
+
+            # THEN: The session should have been closed and set to None, the bible should be deleted, and the result of
+            #       the deletion returned.
+            self.assertTrue(result)
+            mocked_close_all.assert_called_once_with()
+            self.assertIsNone(mocked_bible.session)
+            mocked_delete_file.assert_called_once_with('bibles/KJV.sqlite')