forked from openlp/openlp
some final cleanups
This commit is contained in:
parent
4c8f817269
commit
20ae5d13b0
@ -18,7 +18,7 @@
|
|||||||
<Configurations>
|
<Configurations>
|
||||||
<Configuration
|
<Configuration
|
||||||
Name="Debug|Win32"
|
Name="Debug|Win32"
|
||||||
OutputDirectory="$(SolutionDir)"
|
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||||
IntermediateDirectory="$(ConfigurationName)"
|
IntermediateDirectory="$(ConfigurationName)"
|
||||||
ConfigurationType="2"
|
ConfigurationType="2"
|
||||||
CharacterSet="1"
|
CharacterSet="1"
|
||||||
|
@ -29,9 +29,11 @@
|
|||||||
"""
|
"""
|
||||||
This module contains tests for the pptviewcontroller module of the Presentations plugin.
|
This module contains tests for the pptviewcontroller module of the Presentations plugin.
|
||||||
"""
|
"""
|
||||||
from mock import MagicMock, patch
|
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
|
from tests.functional import MagicMock, patch
|
||||||
|
|
||||||
from openlp.plugins.presentations.lib.pptviewcontroller import PptviewDocument
|
from openlp.plugins.presentations.lib.pptviewcontroller import PptviewDocument
|
||||||
|
|
||||||
#TODO: Items left to test
|
#TODO: Items left to test
|
||||||
|
@ -27,11 +27,13 @@
|
|||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
"""
|
"""
|
||||||
This module contains tests for the pptviewcontroller module of the Presentations plugin.
|
This module contains tests for the presentationcontroller module of the Presentations plugin.
|
||||||
"""
|
"""
|
||||||
from mock import MagicMock, patch
|
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
|
from tests.functional import MagicMock, patch
|
||||||
|
|
||||||
from openlp.plugins.presentations.lib.presentationcontroller import PresentationDocument
|
from openlp.plugins.presentations.lib.presentationcontroller import PresentationDocument
|
||||||
|
|
||||||
# TODO: Items left to test
|
# TODO: Items left to test
|
||||||
@ -99,7 +101,6 @@ class TestPptviewDocument(TestCase):
|
|||||||
|
|
||||||
self.mock_get_thumbnail_folder.return_value = 'returned/path/'
|
self.mock_get_thumbnail_folder.return_value = 'returned/path/'
|
||||||
|
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
"""
|
"""
|
||||||
Stop the patches
|
Stop the patches
|
||||||
|
Loading…
Reference in New Issue
Block a user