From f307568cbbff54e390ed923dd277319634aa6738 Mon Sep 17 00:00:00 2001
From: Phill Ridout <phill.ridout@gmail.com>
Date: Fri, 3 Nov 2017 22:52:24 +0000
Subject: [PATCH] Misc test fixes

---
 openlp/core/common/actions.py                               | 1 +
 openlp/core/ui/servicemanager.py                            | 2 +-
 tests/functional/openlp_core/common/test_actions.py         | 1 +
 tests/functional/openlp_core/common/test_i18n.py            | 2 +-
 tests/interfaces/openlp_core/ui/test_projectormanager.py    | 2 +-
 tests/interfaces/openlp_core/ui/test_projectorsourceform.py | 2 +-
 tests/interfaces/openlp_core/ui/test_thememanager.py        | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openlp/core/common/actions.py b/openlp/core/common/actions.py
index a5b417017..739aba4e3 100644
--- a/openlp/core/common/actions.py
+++ b/openlp/core/common/actions.py
@@ -366,6 +366,7 @@ class ActionList(object):
                 continue
             if existing_action in affected_actions:
                 return False
+            print(existing_action.shortcutContext())
             if existing_action.shortcutContext() in [QtCore.Qt.WindowShortcut, QtCore.Qt.ApplicationShortcut]:
                 return False
             elif action in self.get_all_child_objects(existing_action.parent()):
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index d13d7879d..f5a71934d 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -719,7 +719,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
                           'OpenLP Service Files (*.osz);; OpenLP Service Files - lite (*.oszl)'))
         else:
             file_path, filter_used = FileDialog.getSaveFileName(
-                self.main_window, UiStrings().SaveService, file_path,
+                self.main_window, UiStrings().SaveService, default_file_path,
                 translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz);;'))
         if not file_path:
             return False
diff --git a/tests/functional/openlp_core/common/test_actions.py b/tests/functional/openlp_core/common/test_actions.py
index bd59d6577..57905654d 100644
--- a/tests/functional/openlp_core/common/test_actions.py
+++ b/tests/functional/openlp_core/common/test_actions.py
@@ -153,6 +153,7 @@ class TestActionList(TestCase, TestMixin):
         """
         Prepare the tests
         """
+        self.setup_application()
         self.action_list = ActionList.get_instance()
         self.build_settings()
         self.settings = Settings()
diff --git a/tests/functional/openlp_core/common/test_i18n.py b/tests/functional/openlp_core/common/test_i18n.py
index d6828fb6f..bffb819dc 100644
--- a/tests/functional/openlp_core/common/test_i18n.py
+++ b/tests/functional/openlp_core/common/test_i18n.py
@@ -155,7 +155,7 @@ def test_check_same_instance():
     assert first_instance is second_instance, 'Two UiStrings objects should be the same instance'
 
 
-def test_translate(self):
+def test_translate():
     """
     Test the translate() function
     """
diff --git a/tests/interfaces/openlp_core/ui/test_projectormanager.py b/tests/interfaces/openlp_core/ui/test_projectormanager.py
index ff95c4276..9184035b8 100644
--- a/tests/interfaces/openlp_core/ui/test_projectormanager.py
+++ b/tests/interfaces/openlp_core/ui/test_projectormanager.py
@@ -42,8 +42,8 @@ class TestProjectorManager(TestCase, TestMixin):
         """
         Create the UI and setup necessary options
         """
-        self.build_settings()
         self.setup_application()
+        self.build_settings()
         Registry.create()
         with patch('openlp.core.lib.projector.db.init_url') as mocked_init_url:
             if os.path.exists(TEST_DB):
diff --git a/tests/interfaces/openlp_core/ui/test_projectorsourceform.py b/tests/interfaces/openlp_core/ui/test_projectorsourceform.py
index 4b9e2f402..58094a17c 100644
--- a/tests/interfaces/openlp_core/ui/test_projectorsourceform.py
+++ b/tests/interfaces/openlp_core/ui/test_projectorsourceform.py
@@ -64,8 +64,8 @@ class ProjectorSourceFormTest(TestCase, TestMixin):
         Set up anything necessary for all tests
         """
         mocked_init_url.return_value = 'sqlite:///{}'.format(TEST_DB)
-        self.build_settings()
         self.setup_application()
+        self.build_settings()
         Registry.create()
         # Do not try to recreate if we've already been created from a previous test
         if not hasattr(self, 'projectordb'):
diff --git a/tests/interfaces/openlp_core/ui/test_thememanager.py b/tests/interfaces/openlp_core/ui/test_thememanager.py
index 7f3927cf5..0808b12d0 100644
--- a/tests/interfaces/openlp_core/ui/test_thememanager.py
+++ b/tests/interfaces/openlp_core/ui/test_thememanager.py
@@ -41,8 +41,8 @@ class TestThemeManager(TestCase, TestMixin):
         """
         Create the UI
         """
-        self.build_settings()
         self.setup_application()
+        self.build_settings()
         Registry.create()
         self.theme_manager = ThemeManager()