openlp-core team mailing list archive

Thread
Date

[Merge] lp:~phill-ridout/openlp/moar_test_cleanups into lp:openlp

To: mp+335579@xxxxxxxxxxxxxxxxxx
From: Phill <phill.ridout@xxxxxxxxx>
Date: Sun, 24 Dec 2017 09:32:28 -0000
Reply-to: mp+335579@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Phill has proposed merging lp:~phill-ridout/openlp/moar_test_cleanups into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/moar_test_cleanups/+merge/335579

Move song test resources

lp:~phill-ridout/openlp/moar_test_cleanups (revision 2809)
https://ci.openlp.io/job/Branch-01-Pull/2390/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2291/                  [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/86/                    [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/11/                   [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/10/                    [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1473/                [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1286/                [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/243/                 [WAITING]
[RUNNING]

-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/moar_test_cleanups into lp:openlp.

=== modified file 'tests/functional/openlp_core/ui/test_thememanager.py'
--- tests/functional/openlp_core/ui/test_thememanager.py	2017-12-20 21:18:44 +0000
+++ tests/functional/openlp_core/ui/test_thememanager.py	2017-12-24 09:31:18 +0000
@@ -34,7 +34,7 @@
 from openlp.core.common.path import Path
 from openlp.core.ui import ThemeManager
 
-from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.utils.constants import RESOURCE_PATH
 
 
 class TestThemeManager(TestCase):
@@ -60,7 +60,7 @@
         """
         # GIVEN: A new ThemeManager instance.
         theme_manager = ThemeManager()
-        theme_manager.theme_path = Path(TEST_RESOURCES_PATH, 'themes')
+        theme_manager.theme_path = RESOURCE_PATH / 'themes'
         mocked_zipfile_init.return_value = None
 
         # WHEN: The theme is exported
@@ -68,7 +68,7 @@
 
         # THEN: The zipfile should be created at the given path
         mocked_zipfile_init.assert_called_with(os.path.join('some', 'path', 'Default.otz'), 'w')
-        mocked_zipfile_write.assert_called_with(os.path.join(TEST_RESOURCES_PATH, 'themes', 'Default', 'Default.xml'),
+        mocked_zipfile_write.assert_called_with(str(RESOURCE_PATH / 'themes' / 'Default' / 'Default.xml'),
                                                 os.path.join('Default', 'Default.xml'))
 
     def test_initial_theme_manager(self):
@@ -100,8 +100,8 @@
         mocked_theme.extract_formatted_xml.return_value = 'fake_theme_xml'.encode()
 
         # WHEN: Calling _write_theme with path to the same image, but the path written slightly different
-        file_name1 = Path(TEST_RESOURCES_PATH, 'church.jpg')
-        theme_manager._write_theme(mocked_theme, file_name1, file_name1)
+        file_path_1 = RESOURCE_PATH / 'church.jpg'
+        theme_manager._write_theme(mocked_theme, file_path_1, file_path_1)
 
         # THEN: The mocked_copyfile should not have been called
         assert mocked_copyfile.called is False, 'copyfile should not be called'
@@ -123,9 +123,9 @@
         mocked_theme.filename = "filename"
 
         # WHEN: Calling _write_theme with path to different images
-        file_name1 = Path(TEST_RESOURCES_PATH, 'church.jpg')
-        file_name2 = Path(TEST_RESOURCES_PATH, 'church2.jpg')
-        theme_manager._write_theme(mocked_theme, file_name1, file_name2)
+        file_path_1 = RESOURCE_PATH / 'church.jpg'
+        file_path_2 = RESOURCE_PATH / 'church2.jpg'
+        theme_manager._write_theme(mocked_theme, file_path_1, file_path_2)
 
         # THEN: The mocked_copyfile should not have been called
         assert mocked_copyfile.called is True, 'copyfile should be called'
@@ -200,10 +200,10 @@
             theme_manager.generate_and_save_image = MagicMock()
             theme_manager.theme_path = None
             folder_path = Path(mkdtemp())
-            theme_file = Path(TEST_RESOURCES_PATH, 'themes', 'Moss_on_tree.otz')
+            theme_file_path = RESOURCE_PATH / 'themes' / 'Moss_on_tree.otz'
 
             # WHEN: We try to unzip it
-            theme_manager.unzip_theme(theme_file, folder_path)
+            theme_manager.unzip_theme(theme_file_path, folder_path)
 
             # THEN: Files should be unpacked
             assert (folder_path / 'Moss on tree' / 'Moss on tree.xml').exists() is True

=== modified file 'tests/functional/openlp_plugins/presentations/test_impresscontroller.py'
--- tests/functional/openlp_plugins/presentations/test_impresscontroller.py	2017-12-22 21:04:29 +0000
+++ tests/functional/openlp_plugins/presentations/test_impresscontroller.py	2017-12-24 09:31:18 +0000
@@ -32,7 +32,7 @@
 from openlp.plugins.presentations.lib.impresscontroller import ImpressController, ImpressDocument, TextType
 from openlp.plugins.presentations.presentationplugin import __default_settings__
 
-from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.utils.constants import RESOURCE_PATH
 from tests.helpers.testmixin import TestMixin
 
 
@@ -134,7 +134,7 @@
         mocked_plugin = MagicMock()
         mocked_plugin.settings_section = 'presentations'
         Settings().extend_default_settings(__default_settings__)
-        self.file_name = Path(TEST_RESOURCES_PATH, 'presentations', 'test.pptx')
+        self.file_name = RESOURCE_PATH / 'presentations' / 'test.pptx'
         self.ppc = ImpressController(mocked_plugin)
         self.doc = ImpressDocument(self.ppc, self.file_name)
 

=== modified file 'tests/functional/openlp_plugins/presentations/test_pdfcontroller.py'
--- tests/functional/openlp_plugins/presentations/test_pdfcontroller.py	2017-12-24 07:11:30 +0000
+++ tests/functional/openlp_plugins/presentations/test_pdfcontroller.py	2017-12-24 09:31:18 +0000
@@ -35,7 +35,7 @@
 from openlp.core.common.path import Path
 from openlp.core.display.screens import ScreenList
 
-from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.utils.constants import RESOURCE_PATH
 from tests.helpers.testmixin import TestMixin
 
 __default_settings__ = {
@@ -99,7 +99,7 @@
         Test loading of a Pdf using the PdfController
         """
         # GIVEN: A Pdf-file
-        test_file = Path(TEST_RESOURCES_PATH, 'presentations', 'pdf_test1.pdf')
+        test_file_path = RESOURCE_PATH / 'presentations' / 'pdf_test1.pdf'
 
         # WHEN: The Pdf is loaded
         controller = PdfController(plugin=self.mock_plugin)
@@ -107,7 +107,7 @@
             raise SkipTest('Could not detect mudraw or ghostscript, so skipping PDF test')
         controller.temp_folder = self.temp_folder_path
         controller.thumbnail_folder = self.thumbnail_folder_path
-        document = PdfDocument(controller, test_file)
+        document = PdfDocument(controller, test_file_path)
         loaded = document.load_presentation()
 
         # THEN: The load should succeed and we should be able to get a pagecount
@@ -119,7 +119,7 @@
         Test loading of a Pdf and check size of generate pictures
         """
         # GIVEN: A Pdf-file
-        test_file = Path(TEST_RESOURCES_PATH, 'presentations', 'pdf_test1.pdf')
+        test_file_path = RESOURCE_PATH / 'presentations' / 'pdf_test1.pdf'
 
         # WHEN: The Pdf is loaded
         controller = PdfController(plugin=self.mock_plugin)
@@ -127,7 +127,7 @@
             raise SkipTest('Could not detect mudraw or ghostscript, so skipping PDF test')
         controller.temp_folder = self.temp_folder_path
         controller.thumbnail_folder = self.thumbnail_folder_path
-        document = PdfDocument(controller, test_file)
+        document = PdfDocument(controller, test_file_path)
         loaded = document.load_presentation()
 
         # THEN: The load should succeed and pictures should be created and have been scales to fit the screen

=== modified file 'tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py'
--- tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py	2017-12-24 07:11:30 +0000
+++ tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py	2017-12-24 09:31:18 +0000
@@ -32,7 +32,7 @@
 from openlp.core.common.path import Path
 
 from tests.helpers.testmixin import TestMixin
-from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.utils.constants import RESOURCE_PATH
 
 
 class TestPptviewController(TestCase, TestMixin):
@@ -172,7 +172,7 @@
         """
         # GIVEN: mocked PresentationController.save_titles_and_notes and a pptx file
         doc = PptviewDocument(self.mock_controller, self.mock_presentation)
-        doc.file_path = Path(TEST_RESOURCES_PATH, 'presentations', 'test.pptx')
+        doc.file_path = RESOURCE_PATH / 'presentations' / 'test.pptx'
         doc.save_titles_and_notes = MagicMock()
 
         # WHEN reading the titles and notes
@@ -216,7 +216,7 @@
             mocked_is_zf.return_value = False
             mocked_open.filesize = 10
             doc = PptviewDocument(self.mock_controller, self.mock_presentation)
-            doc.file_path = Path(TEST_RESOURCES_PATH, 'presentations', 'test.ppt')
+            doc.file_path = RESOURCE_PATH / 'presentations' / 'test.ppt'
             doc.save_titles_and_notes = MagicMock()
 
             # WHEN: reading the titles and notes

=== modified file 'tests/functional/openlp_plugins/songs/test_chordproimport.py'
--- tests/functional/openlp_plugins/songs/test_chordproimport.py	2017-12-22 21:20:49 +0000
+++ tests/functional/openlp_plugins/songs/test_chordproimport.py	2017-12-24 09:31:18 +0000
@@ -27,7 +27,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'chordprosongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'chordpro'
 
 
 class TestChordProFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_easyslidesimport.py'
--- tests/functional/openlp_plugins/songs/test_easyslidesimport.py	2017-12-22 21:20:49 +0000
+++ tests/functional/openlp_plugins/songs/test_easyslidesimport.py	2017-12-24 09:31:18 +0000
@@ -24,7 +24,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'easyslidessongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'easyslides'
 
 
 class TestEasySlidesFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_ewimport.py'
--- tests/functional/openlp_plugins/songs/test_ewimport.py	2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_ewimport.py	2017-12-24 09:31:18 +0000
@@ -31,7 +31,7 @@
 
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'easyworshipsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'easyworship'
 SONG_TEST_DATA = [
     {'title': 'Amazing Grace',
      'authors': ['John Newton'],

=== modified file 'tests/functional/openlp_plugins/songs/test_lyriximport.py'
--- tests/functional/openlp_plugins/songs/test_lyriximport.py	2017-12-22 21:20:49 +0000
+++ tests/functional/openlp_plugins/songs/test_lyriximport.py	2017-12-24 09:31:18 +0000
@@ -24,7 +24,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'lyrixsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'lyrix'
 
 
 class TestLyrixFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_openlyricsimport.py'
--- tests/functional/openlp_plugins/songs/test_openlyricsimport.py	2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_openlyricsimport.py	2017-12-24 09:31:18 +0000
@@ -37,7 +37,7 @@
 from tests.helpers.testmixin import TestMixin
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'openlyricssongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'openlyrics'
 SONG_TEST_DATA = {
     'What a friend we have in Jesus.xml': {
         'title': 'What A Friend We Have In Jesus',

=== modified file 'tests/functional/openlp_plugins/songs/test_opensongimport.py'
--- tests/functional/openlp_plugins/songs/test_opensongimport.py	2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_opensongimport.py	2017-12-24 09:31:18 +0000
@@ -31,7 +31,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'opensongsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'opensong'
 
 
 class TestOpenSongFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_opsproimport.py'
--- tests/functional/openlp_plugins/songs/test_opsproimport.py	2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_opsproimport.py	2017-12-24 09:31:18 +0000
@@ -35,7 +35,7 @@
 from tests.utils import load_external_result_data
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'opsprosongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'opspro'
 
 
 def _get_item(data, key):

=== modified file 'tests/functional/openlp_plugins/songs/test_powerpraiseimport.py'
--- tests/functional/openlp_plugins/songs/test_powerpraiseimport.py	2017-12-22 22:21:38 +0000
+++ tests/functional/openlp_plugins/songs/test_powerpraiseimport.py	2017-12-24 09:31:18 +0000
@@ -26,7 +26,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'powerpraisesongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'powerpraise'
 
 
 class TestPowerPraiseFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py'
--- tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py	2017-12-22 22:21:38 +0000
+++ tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py	2017-12-24 09:31:18 +0000
@@ -25,7 +25,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'presentationmanagersongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'presentationmanager'
 
 
 class TestPresentationManagerFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_propresenterimport.py'
--- tests/functional/openlp_plugins/songs/test_propresenterimport.py	2017-12-22 22:21:38 +0000
+++ tests/functional/openlp_plugins/songs/test_propresenterimport.py	2017-12-24 09:31:18 +0000
@@ -26,7 +26,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'propresentersongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'propresenter'
 
 
 class TestProPresenterFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_songbeamerimport.py'
--- tests/functional/openlp_plugins/songs/test_songbeamerimport.py	2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_songbeamerimport.py	2017-12-24 09:31:18 +0000
@@ -31,7 +31,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'songbeamersongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'songbeamer'
 
 
 class TestSongBeamerFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_songproimport.py'
--- tests/functional/openlp_plugins/songs/test_songproimport.py	2017-12-22 22:21:38 +0000
+++ tests/functional/openlp_plugins/songs/test_songproimport.py	2017-12-24 09:31:18 +0000
@@ -26,7 +26,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'songprosongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'songpro'
 
 
 class TestSongProFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_songselect.py'
--- tests/functional/openlp_plugins/songs/test_songselect.py	2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_songselect.py	2017-12-24 09:31:18 +0000
@@ -38,7 +38,7 @@
 from tests.helpers.testmixin import TestMixin
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'songselect'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'songselect'
 
 
 class TestSongSelectImport(TestCase, TestMixin):

=== modified file 'tests/functional/openlp_plugins/songs/test_songshowplusimport.py'
--- tests/functional/openlp_plugins/songs/test_songshowplusimport.py	2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_songshowplusimport.py	2017-12-24 09:31:18 +0000
@@ -31,7 +31,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'songshowplussongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'songshowplus'
 
 
 class TestSongShowPlusFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_sundayplusimport.py'
--- tests/functional/openlp_plugins/songs/test_sundayplusimport.py	2017-12-22 22:21:38 +0000
+++ tests/functional/openlp_plugins/songs/test_sundayplusimport.py	2017-12-24 09:31:18 +0000
@@ -26,7 +26,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'sundayplussongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'sundayplus'
 
 
 class TestSundayPlusFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_videopsalm.py'
--- tests/functional/openlp_plugins/songs/test_videopsalm.py	2017-12-22 22:21:38 +0000
+++ tests/functional/openlp_plugins/songs/test_videopsalm.py	2017-12-24 09:31:18 +0000
@@ -26,7 +26,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'videopsalmsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'videopsalm'
 
 
 class TestVideoPsalmFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py'
--- tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py	2017-12-22 22:21:38 +0000
+++ tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py	2017-12-24 09:31:18 +0000
@@ -25,7 +25,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'wordsofworshipsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'wordsofworship'
 
 
 class TestWordsOfWorshipFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_worshipassistantimport.py'
--- tests/functional/openlp_plugins/songs/test_worshipassistantimport.py	2017-12-24 07:33:22 +0000
+++ tests/functional/openlp_plugins/songs/test_worshipassistantimport.py	2017-12-24 09:31:18 +0000
@@ -26,7 +26,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'worshipassistantsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'worshipassistant'
 
 
 class TestWorshipAssistantFileImport(SongImportTestHelper):

=== modified file 'tests/functional/openlp_plugins/songs/test_zionworximport.py'
--- tests/functional/openlp_plugins/songs/test_zionworximport.py	2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_zionworximport.py	2017-12-24 09:31:18 +0000
@@ -32,7 +32,7 @@
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'zionworxsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'zionworx'
 
 
 class TestZionWorxImport(TestCase):

=== modified file 'tests/interfaces/openlp_core/common/test_utils.py'
--- tests/interfaces/openlp_core/common/test_utils.py	2017-08-25 20:03:25 +0000
+++ tests/interfaces/openlp_core/common/test_utils.py	2017-12-24 09:31:18 +0000
@@ -25,8 +25,8 @@
 from unittest import TestCase
 
 from openlp.core.common import is_not_image_file
-from openlp.core.common.path import Path
-from tests.utils.constants import TEST_RESOURCES_PATH
+
+from tests.utils.constants import RESOURCE_PATH
 from tests.helpers.testmixin import TestMixin
 
 
@@ -59,10 +59,10 @@
         Test the method handles an image file
         """
         # Given and empty string
-        file_name = Path(TEST_RESOURCES_PATH, 'church.jpg')
+        file_path = RESOURCE_PATH / 'church.jpg'
 
         # WHEN testing for it
-        result = is_not_image_file(file_name)
+        result = is_not_image_file(file_path)
 
         # THEN the result is false
         assert result is False, 'The file is present so the test should return False'
@@ -72,10 +72,10 @@
         Test the method handles a non image file
         """
         # Given and empty string
-        file_name = Path(TEST_RESOURCES_PATH, 'serviceitem_custom_1.osj')
+        file_path = RESOURCE_PATH / 'serviceitem_custom_1.osj'
 
         # WHEN testing for it
-        result = is_not_image_file(file_name)
+        result = is_not_image_file(file_path)
 
         # THEN the result is false
         assert result is True, 'The file is not an image file so the test should return True'

=== renamed directory 'tests/resources/chordprosongs' => 'tests/resources/songs/chordpro'
=== renamed directory 'tests/resources/easyslidessongs' => 'tests/resources/songs/easyslides'
=== renamed directory 'tests/resources/easyworshipsongs' => 'tests/resources/songs/easyworship'
=== renamed directory 'tests/resources/lyrixsongs' => 'tests/resources/songs/lyrix'
=== renamed directory 'tests/resources/openlyricssongs' => 'tests/resources/songs/openlyrics'
=== renamed directory 'tests/resources/opensongsongs' => 'tests/resources/songs/opensong'
=== renamed directory 'tests/resources/opsprosongs' => 'tests/resources/songs/opspro'
=== renamed directory 'tests/resources/powerpraisesongs' => 'tests/resources/songs/powerpraise'
=== renamed directory 'tests/resources/presentationmanagersongs' => 'tests/resources/songs/presentationmanager'
=== renamed directory 'tests/resources/propresentersongs' => 'tests/resources/songs/propresenter'
=== renamed directory 'tests/resources/songbeamersongs' => 'tests/resources/songs/songbeamer'
=== renamed directory 'tests/resources/songprosongs' => 'tests/resources/songs/songpro'
=== renamed directory 'tests/resources/songselect' => 'tests/resources/songs/songselect'
=== renamed directory 'tests/resources/songshowplussongs' => 'tests/resources/songs/songshowplus'
=== renamed directory 'tests/resources/sundayplussongs' => 'tests/resources/songs/sundayplus'
=== renamed directory 'tests/resources/videopsalmsongs' => 'tests/resources/songs/videopsalm'
=== renamed directory 'tests/resources/wordsofworshipsongs' => 'tests/resources/songs/wordsofworship'
=== renamed directory 'tests/resources/worshipassistantsongs' => 'tests/resources/songs/worshipassistant'
=== renamed directory 'tests/resources/zionworxsongs' => 'tests/resources/songs/zionworx'

Follow ups

[Merge] lp:~phill-ridout/openlp/moar_test_cleanups into lp:openlp
From: noreply, 2017-12-24
Re: [Merge] lp:~phill-ridout/openlp/moar_test_cleanups into lp:openlp
From: Tim Bentley, 2017-12-24