some final cleanups

openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj

@@ -18,7 +18,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"

tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py

@@ -29,9 +29,11 @@
 """
 This module contains tests for the pptviewcontroller module of the Presentations plugin.
 """
-from mock import MagicMock, patch
+
 from unittest import TestCase
 
+from tests.functional import MagicMock, patch
+
 from openlp.plugins.presentations.lib.pptviewcontroller import PptviewDocument
 
 #TODO: Items left to test

tests/functional/openlp_plugins/presentations/test_presentationcontroller.py

@@ -27,11 +27,13 @@
 # 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 tests.functional import MagicMock, patch
+
 from openlp.plugins.presentations.lib.presentationcontroller import PresentationDocument
 
 # TODO: Items left to test
@@ -99,7 +101,6 @@ class TestPptviewDocument(TestCase):
 
         self.mock_get_thumbnail_folder.return_value = 'returned/path/'
 
-
     def tearDown(self):
         """
         Stop the patches