From bbc1bf37321d893fde68cea7fe9394e5ef76a62d Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Sun, 24 Dec 2017 08:52:53 +0000 Subject: [PATCH] few missed changes --- tests/functional/openlp_plugins/songs/test_songbeamerimport.py | 2 +- tests/functional/openlp_plugins/songs/test_songproimport.py | 2 +- tests/resources/{ => songs}/songselect/TestSong-bin.json | 0 tests/resources/{ => songs}/songselect/TestSong-txt.json | 0 tests/resources/{ => songs}/songselect/TestSong.bin | 0 tests/resources/{ => songs}/songselect/TestSong.txt | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename tests/resources/{ => songs}/songselect/TestSong-bin.json (100%) rename tests/resources/{ => songs}/songselect/TestSong-txt.json (100%) rename tests/resources/{ => songs}/songselect/TestSong.bin (100%) rename tests/resources/{ => songs}/songselect/TestSong.txt (100%) diff --git a/tests/functional/openlp_plugins/songs/test_songbeamerimport.py b/tests/functional/openlp_plugins/songs/test_songbeamerimport.py index 828a9c2ca..01c8867c2 100644 --- a/tests/functional/openlp_plugins/songs/test_songbeamerimport.py +++ b/tests/functional/openlp_plugins/songs/test_songbeamerimport.py @@ -31,7 +31,7 @@ from openlp.plugins.songs.lib.importers.songbeamer import SongBeamerImport, Song from tests.helpers.songfileimport import SongImportTestHelper from tests.utils.constants import RESOURCE_PATH -TEST_PATH = RESOURCE_PATH / 'songs' / 'songbeamersongs' +TEST_PATH = RESOURCE_PATH / 'songs' / 'songbeamer' class TestSongBeamerFileImport(SongImportTestHelper): diff --git a/tests/functional/openlp_plugins/songs/test_songproimport.py b/tests/functional/openlp_plugins/songs/test_songproimport.py index 4839a4785..d33d652e2 100644 --- a/tests/functional/openlp_plugins/songs/test_songproimport.py +++ b/tests/functional/openlp_plugins/songs/test_songproimport.py @@ -26,7 +26,7 @@ SongPro song files into the current installation database. from tests.helpers.songfileimport import SongImportTestHelper from tests.utils.constants import RESOURCE_PATH -TEST_PATH = RESOURCE_PATH / 'songs' / 'songprosongs' +TEST_PATH = RESOURCE_PATH / 'songs' / 'songpro' class TestSongProFileImport(SongImportTestHelper): diff --git a/tests/resources/songselect/TestSong-bin.json b/tests/resources/songs/songselect/TestSong-bin.json similarity index 100% rename from tests/resources/songselect/TestSong-bin.json rename to tests/resources/songs/songselect/TestSong-bin.json diff --git a/tests/resources/songselect/TestSong-txt.json b/tests/resources/songs/songselect/TestSong-txt.json similarity index 100% rename from tests/resources/songselect/TestSong-txt.json rename to tests/resources/songs/songselect/TestSong-txt.json diff --git a/tests/resources/songselect/TestSong.bin b/tests/resources/songs/songselect/TestSong.bin similarity index 100% rename from tests/resources/songselect/TestSong.bin rename to tests/resources/songs/songselect/TestSong.bin diff --git a/tests/resources/songselect/TestSong.txt b/tests/resources/songs/songselect/TestSong.txt similarity index 100% rename from tests/resources/songselect/TestSong.txt rename to tests/resources/songs/songselect/TestSong.txt