forked from openlp/openlp
trunk
This commit is contained in:
commit
6f9056c935
@ -276,7 +276,7 @@ class Plugin(QtCore.QObject, RegistryProperties):
|
|||||||
"""
|
"""
|
||||||
if self.media_item:
|
if self.media_item:
|
||||||
self.media_item.initialise()
|
self.media_item.initialise()
|
||||||
self.main_window.media_dock_manager.insert_dock(self.media_item, self.icon, self.weight)
|
self.main_window.media_dock_manager.add_item_to_dock(self.media_item)
|
||||||
|
|
||||||
def finalise(self):
|
def finalise(self):
|
||||||
"""
|
"""
|
||||||
|
@ -154,8 +154,7 @@ class Ui_MainWindow(object):
|
|||||||
# Create the MediaManager
|
# Create the MediaManager
|
||||||
self.media_manager_dock = OpenLPDockWidget(main_window, 'media_manager_dock',
|
self.media_manager_dock = OpenLPDockWidget(main_window, 'media_manager_dock',
|
||||||
':/system/system_mediamanager.png')
|
':/system/system_mediamanager.png')
|
||||||
# TODO: Figure out how to fix the stylesheet and add it back in
|
self.media_manager_dock.setStyleSheet(MEDIA_MANAGER_STYLE)
|
||||||
# self.media_manager_dock.setStyleSheet(MEDIA_MANAGER_STYLE)
|
|
||||||
# Create the media toolbox
|
# Create the media toolbox
|
||||||
self.media_tool_box = QtWidgets.QToolBox(self.media_manager_dock)
|
self.media_tool_box = QtWidgets.QToolBox(self.media_manager_dock)
|
||||||
self.media_tool_box.setObjectName('media_tool_box')
|
self.media_tool_box.setObjectName('media_tool_box')
|
||||||
|
@ -39,23 +39,12 @@ class MediaDockManager(object):
|
|||||||
"""
|
"""
|
||||||
self.media_dock = media_dock
|
self.media_dock = media_dock
|
||||||
|
|
||||||
def add_dock(self, media_item, icon, weight):
|
def add_item_to_dock(self, media_item):
|
||||||
"""
|
"""
|
||||||
Add a MediaManagerItem to the dock
|
Add a MediaManagerItem to the dock
|
||||||
|
If the item has been added before, it's silently skipped
|
||||||
|
|
||||||
:param media_item: The item to add to the dock
|
:param media_item: The item to add to the dock
|
||||||
:param icon: An icon for this dock item
|
|
||||||
:param weight:
|
|
||||||
"""
|
|
||||||
visible_title = media_item.plugin.get_string(StringContent.VisibleName)
|
|
||||||
log.info('Adding %s dock' % visible_title)
|
|
||||||
self.media_dock.addItem(media_item, icon, visible_title['title'])
|
|
||||||
|
|
||||||
def insert_dock(self, media_item, icon, weight):
|
|
||||||
"""
|
|
||||||
This should insert a dock item at a given location
|
|
||||||
This does not work as it gives a Segmentation error.
|
|
||||||
For now add at end of stack if not present
|
|
||||||
"""
|
"""
|
||||||
visible_title = media_item.plugin.get_string(StringContent.VisibleName)
|
visible_title = media_item.plugin.get_string(StringContent.VisibleName)
|
||||||
log.debug('Inserting %s dock' % visible_title['title'])
|
log.debug('Inserting %s dock' % visible_title['title'])
|
||||||
@ -65,7 +54,7 @@ class MediaDockManager(object):
|
|||||||
match = True
|
match = True
|
||||||
break
|
break
|
||||||
if not match:
|
if not match:
|
||||||
self.media_dock.addItem(media_item, icon, visible_title['title'])
|
self.media_dock.addItem(media_item, visible_title['title'])
|
||||||
|
|
||||||
def remove_dock(self, media_item):
|
def remove_dock(self, media_item):
|
||||||
"""
|
"""
|
||||||
|
@ -621,7 +621,7 @@ class HttpRouter(RegistryProperties):
|
|||||||
event = getattr(self.service_manager, 'servicemanager_%s_item' % action)
|
event = getattr(self.service_manager, 'servicemanager_%s_item' % action)
|
||||||
if self.request_data:
|
if self.request_data:
|
||||||
try:
|
try:
|
||||||
data = json.loads(self.request_data)['request']['id']
|
data = int(json.loads(self.request_data)['request']['id'])
|
||||||
except KeyError:
|
except KeyError:
|
||||||
return self.do_http_error()
|
return self.do_http_error()
|
||||||
event.emit(data)
|
event.emit(data)
|
||||||
|
@ -80,12 +80,14 @@ class TestImageMediaItem(TestCase, TestMixin):
|
|||||||
|
|
||||||
def save_tab_change_test_test(self):
|
def save_tab_change_test_test(self):
|
||||||
"""
|
"""
|
||||||
Test a change triggers post processing.
|
Test a color change is applied and triggers post processing.
|
||||||
"""
|
"""
|
||||||
# GIVEN: Apply a change to the form.
|
# GIVEN: Apply a change to the form.
|
||||||
self.form.background_color = '#999999'
|
self.form.on_background_color_changed('#999999')
|
||||||
# WHEN: the save is invoked
|
# WHEN: the save is invoked
|
||||||
self.form.save()
|
self.form.save()
|
||||||
# THEN: the post process should be requested
|
# THEN: the post process should be requested
|
||||||
self.assertEqual(1, self.form.settings_form.register_post_process.call_count,
|
self.assertEqual(1, self.form.settings_form.register_post_process.call_count,
|
||||||
'Image Post processing should have been requested')
|
'Image Post processing should have been requested')
|
||||||
|
# THEN: The color should be set
|
||||||
|
self.assertEqual(self.form.background_color, '#999999', 'The updated color should have been saved')
|
||||||
|
86
tests/functional/openlp_plugins/media/test_mediaitem.py
Normal file
86
tests/functional/openlp_plugins/media/test_mediaitem.py
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
# -*- 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 #
|
||||||
|
###############################################################################
|
||||||
|
"""
|
||||||
|
Test the media plugin
|
||||||
|
"""
|
||||||
|
from unittest import TestCase
|
||||||
|
|
||||||
|
from openlp.core import Registry, Settings
|
||||||
|
from openlp.plugins.media.mediaplugin import MediaPlugin
|
||||||
|
from openlp.plugins.media.lib.mediaitem import MediaMediaItem
|
||||||
|
from openlp.core.ui.media.mediacontroller import MediaController
|
||||||
|
|
||||||
|
from PyQt5 import QtCore
|
||||||
|
|
||||||
|
from tests.functional import MagicMock, patch
|
||||||
|
from tests.helpers.testmixin import TestMixin
|
||||||
|
|
||||||
|
__default_settings__ = {
|
||||||
|
'media/media auto start': QtCore.Qt.Unchecked,
|
||||||
|
'media/media files': []
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class MediaItemTest(TestCase, TestMixin):
|
||||||
|
"""
|
||||||
|
Test the media item for Media
|
||||||
|
"""
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
"""
|
||||||
|
Set up the components need for all tests.
|
||||||
|
"""
|
||||||
|
with patch('openlp.plugins.media.lib.mediaitem.MediaManagerItem.__init__'),\
|
||||||
|
patch('openlp.plugins.media.lib.mediaitem.MediaMediaItem.setup'):
|
||||||
|
self.media_item = MediaMediaItem(None, MagicMock())
|
||||||
|
self.media_item.settings_section = 'media'
|
||||||
|
self.setup_application()
|
||||||
|
self.build_settings()
|
||||||
|
Settings().extend_default_settings(__default_settings__)
|
||||||
|
|
||||||
|
def tearDown(self):
|
||||||
|
"""
|
||||||
|
Clean up after the tests
|
||||||
|
"""
|
||||||
|
self.destroy_settings()
|
||||||
|
|
||||||
|
def test_search_found(self):
|
||||||
|
"""
|
||||||
|
Media Remote Search Successful find
|
||||||
|
"""
|
||||||
|
# GIVEN: The Mediaitem set up a list of media
|
||||||
|
Settings().setValue(self.media_item.settings_section + '/media files', ['test.mp3', 'test.mp4'])
|
||||||
|
# WHEN: Retrieving the test file
|
||||||
|
result = self.media_item.search('test.mp4', False)
|
||||||
|
# THEN: a file should be found
|
||||||
|
self.assertEqual(result, [['test.mp4', 'test.mp4']], 'The result file contain the file name')
|
||||||
|
|
||||||
|
def test_search_not_found(self):
|
||||||
|
"""
|
||||||
|
Media Remote Search not find
|
||||||
|
"""
|
||||||
|
# GIVEN: The Mediaitem set up a list of media
|
||||||
|
Settings().setValue(self.media_item.settings_section + '/media files', ['test.mp3', 'test.mp4'])
|
||||||
|
# WHEN: Retrieving the test file
|
||||||
|
result = self.media_item.search('test.mpx', False)
|
||||||
|
# THEN: a file should be found
|
||||||
|
self.assertEqual(result, [], 'The result file should be empty')
|
@ -29,7 +29,6 @@ from unittest import TestCase
|
|||||||
from openlp.core.common import Settings, Registry
|
from openlp.core.common import Settings, Registry
|
||||||
from openlp.core.ui import ServiceManager
|
from openlp.core.ui import ServiceManager
|
||||||
from openlp.plugins.remotes.lib.httpserver import HttpRouter
|
from openlp.plugins.remotes.lib.httpserver import HttpRouter
|
||||||
from urllib.parse import urlparse
|
|
||||||
from tests.functional import MagicMock, patch, mock_open
|
from tests.functional import MagicMock, patch, mock_open
|
||||||
from tests.helpers.testmixin import TestMixin
|
from tests.helpers.testmixin import TestMixin
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user