From 20ae5d13b008c004e550a8aefd26ae0b54fad8f0 Mon Sep 17 00:00:00 2001
From: Philip Ridout <phill.ridout@googlemail.com>
Date: Sat, 16 Nov 2013 10:16:06 +0000
Subject: [PATCH] some final cleanups

---
 .../plugins/presentations/lib/pptviewlib/pptviewlib.vcproj | 2 +-
 .../openlp_plugins/presentations/test_pptviewcontroller.py | 4 +++-
 .../presentations/test_presentationcontroller.py           | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj
index dd1b0b505..d2843e510 100644
--- a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj
+++ b/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"
diff --git a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py
index d2d8bb5bd..62a76966d 100644
--- a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py
+++ b/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
diff --git a/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py b/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py
index 8ebf52c09..3ea949b80 100644
--- a/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py
+++ b/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