openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #23919
[Merge] lp:~sam92/openlp/songimport-mv into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/songimport-mv into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~sam92/openlp/songimport-mv/+merge/225536
Cleanup: Move song import plugins into subfolder
The Windows test fails because somehow there still appear the 2.0 bzr tags.
lp:~sam92/openlp/songimport-mv (revision 2399)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/506/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/464/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/409/
[FAILURE] http://ci.openlp.org/job/Branch-04-Windows_Tests/368/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/245/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/119/
--
https://code.launchpad.net/~sam92/openlp/songimport-mv/+merge/225536
Your team OpenLP Core is requested to review the proposed merge of lp:~sam92/openlp/songimport-mv into lp:openlp.
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2014-05-07 20:30:52 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2014-07-03 18:02:07 +0000
@@ -44,7 +44,7 @@
from openlp.plugins.songs.lib import VerseType, clean_song
from openlp.plugins.songs.lib.db import Book, Song, Author, AuthorType, Topic, MediaFile
from openlp.plugins.songs.lib.ui import SongStrings
-from openlp.plugins.songs.lib.xml import SongXML
+from openlp.plugins.songs.lib.openlyricsxml import SongXML
from openlp.plugins.songs.forms.editsongdialog import Ui_EditSongDialog
from openlp.plugins.songs.forms.editverseform import EditVerseForm
from openlp.plugins.songs.forms.mediafilesform import MediaFilesForm
=== modified file 'openlp/plugins/songs/forms/songreviewwidget.py'
--- openlp/plugins/songs/forms/songreviewwidget.py 2014-03-21 21:38:08 +0000
+++ openlp/plugins/songs/forms/songreviewwidget.py 2014-07-03 18:02:07 +0000
@@ -33,7 +33,7 @@
from openlp.core.lib import build_icon
from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib.xml import SongXML
+from openlp.plugins.songs.lib.openlyricsxml import SongXML
class SongReviewWidget(QtGui.QWidget):
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py 2014-06-25 12:23:31 +0000
+++ openlp/plugins/songs/lib/importer.py 2014-07-03 18:02:07 +0000
@@ -34,23 +34,23 @@
from openlp.core.common import translate, UiStrings
from openlp.core.ui.wizard import WizardStrings
-from .opensongimport import OpenSongImport
-from .easyslidesimport import EasySlidesImport
-from .olpimport import OpenLPSongImport
-from .openlyricsimport import OpenLyricsImport
-from .wowimport import WowImport
-from .cclifileimport import CCLIFileImport
-from .dreambeamimport import DreamBeamImport
-from .powersongimport import PowerSongImport
-from .ewimport import EasyWorshipSongImport
-from .songbeamerimport import SongBeamerImport
-from .songshowplusimport import SongShowPlusImport
-from .songproimport import SongProImport
-from .sundayplusimport import SundayPlusImport
-from .foilpresenterimport import FoilPresenterImport
-from .zionworximport import ZionWorxImport
-from .propresenterimport import ProPresenterImport
-from .worshipassistantimport import WorshipAssistantImport
+from .songimport.opensongimport import OpenSongImport
+from .songimport.easyslidesimport import EasySlidesImport
+from .songimport.olpimport import OpenLPSongImport
+from .songimport.openlyricsimport import OpenLyricsImport
+from .songimport.wowimport import WowImport
+from .songimport.cclifileimport import CCLIFileImport
+from .songimport.dreambeamimport import DreamBeamImport
+from .songimport.powersongimport import PowerSongImport
+from .songimport.ewimport import EasyWorshipSongImport
+from .songimport.songbeamerimport import SongBeamerImport
+from .songimport.songshowplusimport import SongShowPlusImport
+from .songimport.songproimport import SongProImport
+from .songimport.sundayplusimport import SundayPlusImport
+from .songimport.foilpresenterimport import FoilPresenterImport
+from .songimport.zionworximport import ZionWorxImport
+from .songimport.propresenterimport import ProPresenterImport
+from .songimport.worshipassistantimport import WorshipAssistantImport
# Imports that might fail
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2014-05-13 09:53:02 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2014-07-03 18:02:07 +0000
@@ -46,7 +46,7 @@
from openlp.plugins.songs.lib import VerseType, clean_string, delete_song
from openlp.plugins.songs.lib.db import Author, AuthorType, Song, Book, MediaFile
from openlp.plugins.songs.lib.ui import SongStrings
-from openlp.plugins.songs.lib.xml import OpenLyrics, SongXML
+from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics, SongXML
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/openlyricsexport.py'
--- openlp/plugins/songs/lib/openlyricsexport.py 2014-03-21 21:38:08 +0000
+++ openlp/plugins/songs/lib/openlyricsexport.py 2014-07-03 18:02:07 +0000
@@ -37,7 +37,7 @@
from openlp.core.common import RegistryProperties, check_directory_exists, translate
from openlp.core.utils import clean_filename
-from openlp.plugins.songs.lib.xml import OpenLyrics
+from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/xml.py' => 'openlp/plugins/songs/lib/openlyricsxml.py'
=== added directory 'openlp/plugins/songs/lib/songimport'
=== added file 'openlp/plugins/songs/lib/songimport/__init__.py'
--- openlp/plugins/songs/lib/songimport/__init__.py 1970-01-01 00:00:00 +0000
+++ openlp/plugins/songs/lib/songimport/__init__.py 2014-07-03 18:02:07 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2014 Raoul Snyman #
+# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
+"""
+The :mod:`~openlp.plugins.songs.lib.import` module contains importers for the Songs plugin.
+"""
=== renamed file 'openlp/plugins/songs/lib/cclifileimport.py' => 'openlp/plugins/songs/lib/songimport/cclifileimport.py'
=== renamed file 'openlp/plugins/songs/lib/dreambeamimport.py' => 'openlp/plugins/songs/lib/songimport/dreambeamimport.py'
--- openlp/plugins/songs/lib/dreambeamimport.py 2014-03-21 21:38:08 +0000
+++ openlp/plugins/songs/lib/songimport/dreambeamimport.py 2014-07-03 18:02:07 +0000
@@ -35,7 +35,7 @@
from lxml import etree, objectify
from openlp.core.lib import translate
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
from openlp.plugins.songs.lib.ui import SongStrings
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/easyslidesimport.py' => 'openlp/plugins/songs/lib/songimport/easyslidesimport.py'
--- openlp/plugins/songs/lib/easyslidesimport.py 2014-05-02 06:42:17 +0000
+++ openlp/plugins/songs/lib/songimport/easyslidesimport.py 2014-07-03 18:02:07 +0000
@@ -33,7 +33,7 @@
from lxml import etree, objectify
from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/ewimport.py' => 'openlp/plugins/songs/lib/songimport/ewimport.py'
=== renamed file 'openlp/plugins/songs/lib/foilpresenterimport.py' => 'openlp/plugins/songs/lib/songimport/foilpresenterimport.py'
--- openlp/plugins/songs/lib/foilpresenterimport.py 2014-05-07 09:51:59 +0000
+++ openlp/plugins/songs/lib/songimport/foilpresenterimport.py 2014-07-03 18:02:07 +0000
@@ -99,10 +99,10 @@
from openlp.core.lib import translate
from openlp.core.ui.wizard import WizardStrings
from openlp.plugins.songs.lib import clean_song, VerseType
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
from openlp.plugins.songs.lib.db import Author, Book, Song, Topic
from openlp.plugins.songs.lib.ui import SongStrings
-from openlp.plugins.songs.lib.xml import SongXML
+from openlp.plugins.songs.lib.openlyricsxml import SongXML
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/mediashoutimport.py' => 'openlp/plugins/songs/lib/songimport/mediashoutimport.py'
--- openlp/plugins/songs/lib/mediashoutimport.py 2014-03-06 22:05:15 +0000
+++ openlp/plugins/songs/lib/songimport/mediashoutimport.py 2014-07-03 18:02:07 +0000
@@ -33,7 +33,7 @@
import pyodbc
from openlp.core.lib import translate
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
VERSE_TAGS = ['V', 'C', 'B', 'O', 'P', 'I', 'E']
=== renamed file 'openlp/plugins/songs/lib/olpimport.py' => 'openlp/plugins/songs/lib/songimport/olpimport.py'
=== renamed file 'openlp/plugins/songs/lib/oooimport.py' => 'openlp/plugins/songs/lib/songimport/oooimport.py'
=== renamed file 'openlp/plugins/songs/lib/openlyricsimport.py' => 'openlp/plugins/songs/lib/songimport/openlyricsimport.py'
--- openlp/plugins/songs/lib/openlyricsimport.py 2014-04-16 20:37:15 +0000
+++ openlp/plugins/songs/lib/songimport/openlyricsimport.py 2014-07-03 18:02:07 +0000
@@ -37,9 +37,9 @@
from lxml import etree
from openlp.core.ui.wizard import WizardStrings
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
from openlp.plugins.songs.lib.ui import SongStrings
-from openlp.plugins.songs.lib.xml import OpenLyrics, OpenLyricsError
+from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics, OpenLyricsError
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/opensongimport.py' => 'openlp/plugins/songs/lib/songimport/opensongimport.py'
--- openlp/plugins/songs/lib/opensongimport.py 2014-04-30 20:50:57 +0000
+++ openlp/plugins/songs/lib/songimport/opensongimport.py 2014-07-03 18:02:07 +0000
@@ -35,7 +35,7 @@
from openlp.core.common import translate
from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
from openlp.plugins.songs.lib.ui import SongStrings
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/powersongimport.py' => 'openlp/plugins/songs/lib/songimport/powersongimport.py'
--- openlp/plugins/songs/lib/powersongimport.py 2014-03-21 21:38:08 +0000
+++ openlp/plugins/songs/lib/songimport/powersongimport.py 2014-07-03 18:02:07 +0000
@@ -35,7 +35,7 @@
import os
from openlp.core.common import translate
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/propresenterimport.py' => 'openlp/plugins/songs/lib/songimport/propresenterimport.py'
=== renamed file 'openlp/plugins/songs/lib/sofimport.py' => 'openlp/plugins/songs/lib/songimport/sofimport.py'
=== renamed file 'openlp/plugins/songs/lib/songbeamerimport.py' => 'openlp/plugins/songs/lib/songimport/songbeamerimport.py'
--- openlp/plugins/songs/lib/songbeamerimport.py 2014-05-07 23:52:51 +0000
+++ openlp/plugins/songs/lib/songimport/songbeamerimport.py 2014-07-03 18:02:07 +0000
@@ -36,7 +36,7 @@
import re
from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/songimport.py' => 'openlp/plugins/songs/lib/songimport/songimport.py'
--- openlp/plugins/songs/lib/songimport.py 2014-06-26 08:04:33 +0000
+++ openlp/plugins/songs/lib/songimport/songimport.py 2014-07-03 18:02:07 +0000
@@ -39,7 +39,7 @@
from openlp.plugins.songs.lib import clean_song, VerseType
from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile
from openlp.plugins.songs.lib.ui import SongStrings
-from openlp.plugins.songs.lib.xml import SongXML
+from openlp.plugins.songs.lib.openlyricsxml import SongXML
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/songproimport.py' => 'openlp/plugins/songs/lib/songimport/songproimport.py'
--- openlp/plugins/songs/lib/songproimport.py 2014-03-08 19:58:58 +0000
+++ openlp/plugins/songs/lib/songimport/songproimport.py 2014-07-03 18:02:07 +0000
@@ -33,7 +33,7 @@
import re
from openlp.plugins.songs.lib import strip_rtf
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
class SongProImport(SongImport):
=== renamed file 'openlp/plugins/songs/lib/songshowplusimport.py' => 'openlp/plugins/songs/lib/songimport/songshowplusimport.py'
--- openlp/plugins/songs/lib/songshowplusimport.py 2014-05-07 19:17:47 +0000
+++ openlp/plugins/songs/lib/songimport/songshowplusimport.py 2014-07-03 18:02:07 +0000
@@ -38,7 +38,7 @@
from openlp.core.ui.wizard import WizardStrings
from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
TITLE = 1
AUTHOR = 2
=== renamed file 'openlp/plugins/songs/lib/sundayplusimport.py' => 'openlp/plugins/songs/lib/songimport/sundayplusimport.py'
--- openlp/plugins/songs/lib/sundayplusimport.py 2014-05-05 16:20:54 +0000
+++ openlp/plugins/songs/lib/songimport/sundayplusimport.py 2014-07-03 18:02:07 +0000
@@ -32,7 +32,7 @@
from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
from openlp.plugins.songs.lib import strip_rtf
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
HOTKEY_TO_VERSE_TYPE = {
'1': 'v1',
=== renamed file 'openlp/plugins/songs/lib/worshipassistantimport.py' => 'openlp/plugins/songs/lib/songimport/worshipassistantimport.py'
--- openlp/plugins/songs/lib/worshipassistantimport.py 2014-06-30 07:18:26 +0000
+++ openlp/plugins/songs/lib/songimport/worshipassistantimport.py 2014-07-03 18:02:07 +0000
@@ -37,7 +37,7 @@
from openlp.core.common import translate
from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/worshipcenterproimport.py' => 'openlp/plugins/songs/lib/songimport/worshipcenterproimport.py'
--- openlp/plugins/songs/lib/worshipcenterproimport.py 2014-03-21 21:38:08 +0000
+++ openlp/plugins/songs/lib/songimport/worshipcenterproimport.py 2014-07-03 18:02:07 +0000
@@ -35,7 +35,7 @@
import pyodbc
from openlp.core.common import translate
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
log = logging.getLogger(__name__)
=== renamed file 'openlp/plugins/songs/lib/wowimport.py' => 'openlp/plugins/songs/lib/songimport/wowimport.py'
--- openlp/plugins/songs/lib/wowimport.py 2014-03-08 19:58:58 +0000
+++ openlp/plugins/songs/lib/songimport/wowimport.py 2014-07-03 18:02:07 +0000
@@ -34,7 +34,7 @@
import logging
from openlp.core.common import translate
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
BLOCK_TYPES = ('V', 'C', 'B')
=== renamed file 'openlp/plugins/songs/lib/zionworximport.py' => 'openlp/plugins/songs/lib/songimport/zionworximport.py'
--- openlp/plugins/songs/lib/zionworximport.py 2014-03-21 21:38:08 +0000
+++ openlp/plugins/songs/lib/songimport/zionworximport.py 2014-07-03 18:02:07 +0000
@@ -34,7 +34,7 @@
import logging
from openlp.core.common import translate
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/songselect.py'
--- openlp/plugins/songs/lib/songselect.py 2014-05-07 10:25:36 +0000
+++ openlp/plugins/songs/lib/songselect.py 2014-07-03 18:02:07 +0000
@@ -38,7 +38,7 @@
from bs4 import BeautifulSoup, NavigableString
from openlp.plugins.songs.lib import Song, VerseType, clean_song, Author
-from openlp.plugins.songs.lib.xml import SongXML
+from openlp.plugins.songs.lib.openlyricsxml import SongXML
USER_AGENT = 'Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; GT-I9000 ' \
'Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 ' \
=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py 2014-05-03 10:03:50 +0000
+++ openlp/plugins/songs/songsplugin.py 2014-07-03 18:02:07 +0000
@@ -49,7 +49,7 @@
from openlp.plugins.songs.lib.db import init_schema, Song
from openlp.plugins.songs.lib.mediaitem import SongSearch
from openlp.plugins.songs.lib.importer import SongFormat
-from openlp.plugins.songs.lib.olpimport import OpenLPSongImport
+from openlp.plugins.songs.lib.songimport.olpimport import OpenLPSongImport
from openlp.plugins.songs.lib.mediaitem import SongMediaItem
from openlp.plugins.songs.lib.songstab import SongsTab
=== modified file 'tests/functional/openlp_plugins/songs/test_ewimport.py'
--- tests/functional/openlp_plugins/songs/test_ewimport.py 2014-06-09 07:55:48 +0000
+++ tests/functional/openlp_plugins/songs/test_ewimport.py 2014-07-03 18:02:07 +0000
@@ -35,7 +35,7 @@
from tests.functional import MagicMock, patch
-from openlp.plugins.songs.lib.ewimport import EasyWorshipSongImport, FieldDescEntry, FieldType
+from openlp.plugins.songs.lib.songimport.ewimport import EasyWorshipSongImport, FieldDescEntry, FieldType
TEST_PATH = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'easyworshipsongs'))
@@ -178,7 +178,7 @@
Test creating an instance of the EasyWorship file importer
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'):
mocked_manager = MagicMock()
# WHEN: An importer object is created
@@ -192,7 +192,7 @@
Test finding an existing field in a given list using the :mod:`find_field`
"""
# GIVEN: A mocked out SongImport class, a mocked out "manager" and a list of field descriptions.
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'):
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
importer.field_descriptions = TEST_FIELD_DESCS
@@ -210,7 +210,7 @@
Test finding an non-existing field in a given list using the :mod:`find_field`
"""
# GIVEN: A mocked out SongImport class, a mocked out "manager" and a list of field descriptions
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'):
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
importer.field_descriptions = TEST_FIELD_DESCS
@@ -228,8 +228,8 @@
"""
# GIVEN: A mocked out SongImport class, a mocked out struct class, and a mocked out "manager" and a list of
# field descriptions
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
- patch('openlp.plugins.songs.lib.ewimport.struct') as mocked_struct:
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.struct') as mocked_struct:
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
@@ -246,7 +246,7 @@
Test the :mod:`get_field` module
"""
# GIVEN: A mocked out SongImport class, a mocked out "manager", an encoding and some test data and known results
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'):
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
importer.encoding = TEST_DATA_ENCODING
@@ -269,7 +269,7 @@
"""
for test_results in GET_MEMO_FIELD_TEST_RESULTS:
# GIVEN: A mocked out SongImport class, a mocked out "manager", a mocked out memo_file and an encoding
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'):
mocked_manager = MagicMock()
mocked_memo_file = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
@@ -300,8 +300,8 @@
Test the :mod:`do_import` module opens the correct files
"""
# GIVEN: A mocked out SongImport class, a mocked out "manager"
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
- patch('openlp.plugins.songs.lib.ewimport.os.path') as mocked_os_path:
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.os.path') as mocked_os_path:
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
mocked_os_path.isfile.side_effect = [True, False]
@@ -319,8 +319,8 @@
Test the :mod:`do_import` module produces an error when Songs.MB not found.
"""
# GIVEN: A mocked out SongImport class, a mocked out "manager"
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
- patch('openlp.plugins.songs.lib.ewimport.os.path') as mocked_os_path:
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.os.path') as mocked_os_path:
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
importer.log_error = MagicMock()
@@ -339,8 +339,8 @@
Test the :mod:`do_import` module handles invalid database files correctly
"""
# GIVEN: A mocked out SongImport class, os.path and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
- patch('openlp.plugins.songs.lib.ewimport.os.path') as mocked_os_path:
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.os.path') as mocked_os_path:
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
mocked_os_path.isfile.return_value = True
@@ -358,10 +358,10 @@
Test the :mod:`do_import` module handles invalid memo files correctly
"""
# GIVEN: A mocked out SongImport class, a mocked out "manager"
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
- patch('openlp.plugins.songs.lib.ewimport.os.path') as mocked_os_path, \
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.os.path') as mocked_os_path, \
patch('builtins.open') as mocked_open, \
- patch('openlp.plugins.songs.lib.ewimport.struct') as mocked_struct:
+ patch('openlp.plugins.songs.lib.songimport.ewimport.struct') as mocked_struct:
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
mocked_os_path.isfile.return_value = True
@@ -385,10 +385,10 @@
Test the :mod:`do_import` converts the code page to the encoding correctly
"""
# GIVEN: A mocked out SongImport class, a mocked out "manager"
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
- patch('openlp.plugins.songs.lib.ewimport.os.path') as mocked_os_path, \
- patch('builtins.open'), patch('openlp.plugins.songs.lib.ewimport.struct') as mocked_struct, \
- patch('openlp.plugins.songs.lib.ewimport.retrieve_windows_encoding') as \
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.os.path') as mocked_os_path, \
+ patch('builtins.open'), patch('openlp.plugins.songs.lib.songimport.ewimport.struct') as mocked_struct, \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.retrieve_windows_encoding') as \
mocked_retrieve_windows_encoding:
mocked_manager = MagicMock()
importer = EasyWorshipSongImport(mocked_manager, filenames=[])
@@ -413,8 +413,8 @@
# GIVEN: Test files with a mocked out SongImport class, a mocked out "manager", a mocked out "import_wizard",
# and mocked out "author", "add_copyright", "add_verse", "finish" methods.
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
- patch('openlp.plugins.songs.lib.ewimport.retrieve_windows_encoding') as \
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.retrieve_windows_encoding') as \
mocked_retrieve_windows_encoding:
mocked_retrieve_windows_encoding.return_value = 'cp1252'
mocked_manager = MagicMock()
@@ -469,8 +469,8 @@
# GIVEN: Test files with a mocked out SongImport class, a mocked out "manager", a mocked out "import_wizard",
# and mocked out "author", "add_copyright", "add_verse", "finish" methods.
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
- patch('openlp.plugins.songs.lib.ewimport.retrieve_windows_encoding') \
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.ewimport.retrieve_windows_encoding') \
as mocked_retrieve_windows_encoding:
mocked_retrieve_windows_encoding.return_value = 'cp1252'
mocked_manager = MagicMock()
@@ -509,7 +509,7 @@
"""
# GIVEN: A mocked out SongImport class, a mocked out "manager" and mocked out "author" method.
- with patch('openlp.plugins.songs.lib.ewimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.ewimport.SongImport'):
mocked_manager = MagicMock()
mocked_add_author = MagicMock()
importer = EasyWorshipSongImportLogger(mocked_manager)
=== modified file 'tests/functional/openlp_plugins/songs/test_foilpresenterimport.py'
--- tests/functional/openlp_plugins/songs/test_foilpresenterimport.py 2014-04-20 20:19:21 +0000
+++ tests/functional/openlp_plugins/songs/test_foilpresenterimport.py 2014-07-03 18:02:07 +0000
@@ -34,7 +34,7 @@
from unittest import TestCase
from tests.functional import patch, MagicMock
-from openlp.plugins.songs.lib.foilpresenterimport import FoilPresenter
+from openlp.plugins.songs.lib.songimport.foilpresenterimport import FoilPresenter
TEST_PATH = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..', '..', '/resources/foilpresentersongs'))
@@ -57,27 +57,27 @@
# _process_topics
def setUp(self):
- self.child_patcher = patch('openlp.plugins.songs.lib.foilpresenterimport.FoilPresenter._child')
- self.clean_song_patcher = patch('openlp.plugins.songs.lib.foilpresenterimport.clean_song')
- self.objectify_patcher = patch('openlp.plugins.songs.lib.foilpresenterimport.objectify')
+ self.child_patcher = patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.FoilPresenter._child')
+ self.clean_song_patcher = patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.clean_song')
+ self.objectify_patcher = patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.objectify')
self.process_authors_patcher = \
- patch('openlp.plugins.songs.lib.foilpresenterimport.FoilPresenter._process_authors')
+ patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.FoilPresenter._process_authors')
self.process_cclinumber_patcher = \
- patch('openlp.plugins.songs.lib.foilpresenterimport.FoilPresenter._process_cclinumber')
+ patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.FoilPresenter._process_cclinumber')
self.process_comments_patcher = \
- patch('openlp.plugins.songs.lib.foilpresenterimport.FoilPresenter._process_comments')
+ patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.FoilPresenter._process_comments')
self.process_lyrics_patcher = \
- patch('openlp.plugins.songs.lib.foilpresenterimport.FoilPresenter._process_lyrics')
+ patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.FoilPresenter._process_lyrics')
self.process_songbooks_patcher = \
- patch('openlp.plugins.songs.lib.foilpresenterimport.FoilPresenter._process_songbooks')
+ patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.FoilPresenter._process_songbooks')
self.process_titles_patcher = \
- patch('openlp.plugins.songs.lib.foilpresenterimport.FoilPresenter._process_titles')
+ patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.FoilPresenter._process_titles')
self.process_topics_patcher = \
- patch('openlp.plugins.songs.lib.foilpresenterimport.FoilPresenter._process_topics')
- self.re_patcher = patch('openlp.plugins.songs.lib.foilpresenterimport.re')
- self.song_patcher = patch('openlp.plugins.songs.lib.foilpresenterimport.Song')
- self.song_xml_patcher = patch('openlp.plugins.songs.lib.foilpresenterimport.SongXML')
- self.translate_patcher = patch('openlp.plugins.songs.lib.foilpresenterimport.translate')
+ patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.FoilPresenter._process_topics')
+ self.re_patcher = patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.re')
+ self.song_patcher = patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.Song')
+ self.song_xml_patcher = patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.SongXML')
+ self.translate_patcher = patch('openlp.plugins.songs.lib.songimport.foilpresenterimport.translate')
self.mocked_child = self.child_patcher.start()
self.mocked_clean_song = self.clean_song_patcher.start()
=== modified file 'tests/functional/openlp_plugins/songs/test_openlyricsimport.py'
--- tests/functional/openlp_plugins/songs/test_openlyricsimport.py 2014-04-17 14:32:56 +0000
+++ tests/functional/openlp_plugins/songs/test_openlyricsimport.py 2014-07-03 18:02:07 +0000
@@ -34,8 +34,8 @@
from unittest import TestCase
from tests.functional import MagicMock, patch
-from openlp.plugins.songs.lib.openlyricsimport import OpenLyricsImport
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.openlyricsimport import OpenLyricsImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),
'..', '..', '..', 'resources', 'openlyricssongs'))
@@ -69,7 +69,7 @@
Test creating an instance of the OpenLyrics file importer
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songbeamerimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.openlyricsimport.SongImport'):
mocked_manager = MagicMock()
# WHEN: An importer object is created
=== modified file 'tests/functional/openlp_plugins/songs/test_opensongimport.py'
--- tests/functional/openlp_plugins/songs/test_opensongimport.py 2014-06-25 15:03:00 +0000
+++ tests/functional/openlp_plugins/songs/test_opensongimport.py 2014-07-03 18:02:07 +0000
@@ -34,7 +34,7 @@
from unittest import TestCase
from tests.helpers.songfileimport import SongImportTestHelper
-from openlp.plugins.songs.lib.opensongimport import OpenSongImport
+from openlp.plugins.songs.lib.songimport.opensongimport import OpenSongImport
from tests.functional import patch, MagicMock
TEST_PATH = os.path.abspath(
@@ -69,7 +69,7 @@
Test creating an instance of the OpenSong file importer
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.opensongimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.opensongimport.SongImport'):
mocked_manager = MagicMock()
# WHEN: An importer object is created
@@ -83,7 +83,7 @@
Test OpenSongImport.do_import handles different invalid import_source values
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.opensongimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.opensongimport.SongImport'):
mocked_manager = MagicMock()
mocked_import_wizard = MagicMock()
importer = OpenSongImport(mocked_manager, filenames=[])
@@ -104,7 +104,7 @@
Test OpenSongImport.do_import handles different invalid import_source values
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.opensongimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.opensongimport.SongImport'):
mocked_manager = MagicMock()
mocked_import_wizard = MagicMock()
importer = OpenSongImport(mocked_manager, filenames=[])
=== modified file 'tests/functional/openlp_plugins/songs/test_songbeamerimport.py'
--- tests/functional/openlp_plugins/songs/test_songbeamerimport.py 2014-05-07 23:52:51 +0000
+++ tests/functional/openlp_plugins/songs/test_songbeamerimport.py 2014-07-03 18:02:07 +0000
@@ -34,7 +34,7 @@
from unittest import TestCase
from tests.functional import MagicMock, patch
-from openlp.plugins.songs.lib.songbeamerimport import SongBeamerImport
+from openlp.plugins.songs.lib.songimport.songbeamerimport import SongBeamerImport
from openlp.plugins.songs.lib import VerseType
TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),
@@ -64,7 +64,7 @@
Test creating an instance of the SongBeamer file importer
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songbeamerimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songbeamerimport.SongImport'):
mocked_manager = MagicMock()
# WHEN: An importer object is created
@@ -78,7 +78,7 @@
Test SongBeamerImport.do_import handles different invalid import_source values
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songbeamerimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songbeamerimport.SongImport'):
mocked_manager = MagicMock()
mocked_import_wizard = MagicMock()
importer = SongBeamerImport(mocked_manager, filenames=[])
@@ -99,7 +99,7 @@
Test SongBeamerImport.do_import handles different invalid import_source values
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songbeamerimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songbeamerimport.SongImport'):
mocked_manager = MagicMock()
mocked_import_wizard = MagicMock()
importer = SongBeamerImport(mocked_manager, filenames=[])
@@ -122,7 +122,7 @@
# GIVEN: Test files with a mocked out SongImport class, a mocked out "manager", a mocked out "import_wizard",
# and mocked out "author", "add_copyright", "add_verse", "finish" methods.
- with patch('openlp.plugins.songs.lib.songbeamerimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songbeamerimport.SongImport'):
for song_file in SONG_TEST_DATA:
mocked_manager = MagicMock()
mocked_import_wizard = MagicMock()
=== modified file 'tests/functional/openlp_plugins/songs/test_songshowplusimport.py'
--- tests/functional/openlp_plugins/songs/test_songshowplusimport.py 2014-06-25 15:03:00 +0000
+++ tests/functional/openlp_plugins/songs/test_songshowplusimport.py 2014-07-03 18:02:07 +0000
@@ -35,7 +35,7 @@
from tests.helpers.songfileimport import SongImportTestHelper
from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib.songshowplusimport import SongShowPlusImport
+from openlp.plugins.songs.lib.songimport.songshowplusimport import SongShowPlusImport
from tests.functional import patch, MagicMock
TEST_PATH = os.path.abspath(
@@ -70,7 +70,7 @@
Test creating an instance of the SongShow Plus file importer
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songshowplusimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songshowplusimport.SongImport'):
mocked_manager = MagicMock()
# WHEN: An importer object is created
@@ -84,7 +84,7 @@
Test SongShowPlusImport.do_import handles different invalid import_source values
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songshowplusimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songshowplusimport.SongImport'):
mocked_manager = MagicMock()
mocked_import_wizard = MagicMock()
importer = SongShowPlusImport(mocked_manager, filenames=[])
@@ -105,7 +105,7 @@
Test SongShowPlusImport.do_import handles different invalid import_source values
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songshowplusimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songshowplusimport.SongImport'):
mocked_manager = MagicMock()
mocked_import_wizard = MagicMock()
importer = SongShowPlusImport(mocked_manager, filenames=[])
@@ -126,7 +126,7 @@
Test to_openlp_verse_tag method by simulating adding a verse
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songshowplusimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songshowplusimport.SongImport'):
mocked_manager = MagicMock()
importer = SongShowPlusImport(mocked_manager, filenames=[])
@@ -154,7 +154,7 @@
Test to_openlp_verse_tag method by simulating adding a verse to the verse order
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.songshowplusimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.songshowplusimport.SongImport'):
mocked_manager = MagicMock()
importer = SongShowPlusImport(mocked_manager, filenames=[])
=== modified file 'tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py'
--- tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py 2014-04-02 19:35:09 +0000
+++ tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py 2014-07-03 18:02:07 +0000
@@ -37,7 +37,7 @@
import pyodbc
-from openlp.plugins.songs.lib.worshipcenterproimport import WorshipCenterProImport
+from openlp.plugins.songs.lib.songimport.worshipcenterproimport import WorshipCenterProImport
from tests.functional import patch, MagicMock
@@ -141,7 +141,7 @@
Test creating an instance of the WorshipCenter Pro file importer
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.worshipcenterproimport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.worshipcenterproimport.SongImport'):
mocked_manager = MagicMock()
# WHEN: An importer object is created
@@ -156,9 +156,10 @@
"""
# GIVEN: A mocked out SongImport class, a mocked out pyodbc module, a mocked out translate method,
# a mocked "manager" and a mocked out log_error method.
- with patch('openlp.plugins.songs.lib.worshipcenterproimport.SongImport'), \
- patch('openlp.plugins.songs.lib.worshipcenterproimport.pyodbc.connect') as mocked_pyodbc_connect, \
- patch('openlp.plugins.songs.lib.worshipcenterproimport.translate') as mocked_translate:
+ with patch('openlp.plugins.songs.lib.songimport.worshipcenterproimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.worshipcenterproimport.pyodbc.connect') \
+ as mocked_pyodbc_connect, \
+ patch('openlp.plugins.songs.lib.songimport.worshipcenterproimport.translate') as mocked_translate:
mocked_manager = MagicMock()
mocked_log_error = MagicMock()
mocked_translate.return_value = 'Translated Text'
@@ -185,9 +186,9 @@
"""
# GIVEN: A mocked out SongImport class, a mocked out pyodbc module with a simulated recordset, a mocked out
# translate method, a mocked "manager", add_verse method & mocked_finish method.
- with patch('openlp.plugins.songs.lib.worshipcenterproimport.SongImport'), \
- patch('openlp.plugins.songs.lib.worshipcenterproimport.pyodbc') as mocked_pyodbc, \
- patch('openlp.plugins.songs.lib.worshipcenterproimport.translate') as mocked_translate:
+ with patch('openlp.plugins.songs.lib.songimport.worshipcenterproimport.SongImport'), \
+ patch('openlp.plugins.songs.lib.songimport.worshipcenterproimport.pyodbc') as mocked_pyodbc, \
+ patch('openlp.plugins.songs.lib.songimport.worshipcenterproimport.translate') as mocked_translate:
mocked_manager = MagicMock()
mocked_import_wizard = MagicMock()
mocked_add_verse = MagicMock()
=== modified file 'tests/functional/openlp_plugins/songs/test_zionworximport.py'
--- tests/functional/openlp_plugins/songs/test_zionworximport.py 2014-06-09 10:27:17 +0000
+++ tests/functional/openlp_plugins/songs/test_zionworximport.py 2014-07-03 18:02:07 +0000
@@ -33,8 +33,8 @@
from unittest import TestCase
from tests.functional import MagicMock, patch
-from openlp.plugins.songs.lib.zionworximport import ZionWorxImport
-from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.songimport.zionworximport import ZionWorxImport
+from openlp.plugins.songs.lib.songimport.songimport import SongImport
class TestZionWorxImport(TestCase):
@@ -46,7 +46,7 @@
Test creating an instance of the ZionWorx file importer
"""
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
- with patch('openlp.plugins.songs.lib.zionworximport.SongImport'):
+ with patch('openlp.plugins.songs.lib.songimport.zionworximport.SongImport'):
mocked_manager = MagicMock()
# WHEN: An importer object is created
=== modified file 'tests/helpers/songfileimport.py'
--- tests/helpers/songfileimport.py 2014-06-25 15:03:00 +0000
+++ tests/helpers/songfileimport.py 2014-07-03 18:02:07 +0000
@@ -43,7 +43,7 @@
def __init__(self, *args, **kwargs):
super(SongImportTestHelper, self).__init__(*args, **kwargs)
self.importer_module = __import__(
- 'openlp.plugins.songs.lib.%s' % self.importer_module_name, fromlist=[self.importer_class_name])
+ 'openlp.plugins.songs.lib.songimport.%s' % self.importer_module_name, fromlist=[self.importer_class_name])
self.importer_class = getattr(self.importer_module, self.importer_class_name)
def setUp(self):
@@ -51,14 +51,18 @@
Patch and set up the mocks required.
"""
self.add_copyright_patcher = patch(
- 'openlp.plugins.songs.lib.%s.%s.add_copyright' % (self.importer_module_name, self.importer_class_name))
+ 'openlp.plugins.songs.lib.songimport.%s.%s.add_copyright' % (self.importer_module_name,
+ self.importer_class_name))
self.add_verse_patcher = patch(
- 'openlp.plugins.songs.lib.%s.%s.add_verse' % (self.importer_module_name, self.importer_class_name))
+ 'openlp.plugins.songs.lib.songimport.%s.%s.add_verse' % (self.importer_module_name,
+ self.importer_class_name))
self.finish_patcher = patch(
- 'openlp.plugins.songs.lib.%s.%s.finish' % (self.importer_module_name, self.importer_class_name))
+ 'openlp.plugins.songs.lib.songimport.%s.%s.finish' % (self.importer_module_name, self.importer_class_name))
self.add_author_patcher = patch(
- 'openlp.plugins.songs.lib.%s.%s.add_author' % (self.importer_module_name, self.importer_class_name))
- self.song_import_patcher = patch('openlp.plugins.songs.lib.%s.SongImport' % self.importer_module_name)
+ 'openlp.plugins.songs.lib.songimport.%s.%s.add_author' % (self.importer_module_name,
+ self.importer_class_name))
+ self.song_import_patcher = patch('openlp.plugins.songs.lib.songimport.%s.SongImport' %
+ self.importer_module_name)
self.mocked_add_copyright = self.add_copyright_patcher.start()
self.mocked_add_verse = self.add_verse_patcher.start()
self.mocked_finish = self.finish_patcher.start()
Follow ups
