From e18820b846d0877e6c288c06f626b67f466c31da Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Mon, 12 Aug 2019 15:37:19 +0200
Subject: [PATCH] Fix tests for ContainerManager

CURA-6600
---
 cura/Settings/IntentManager.py         |  1 -
 tests/Settings/TestContainerManager.py | 32 +++++++++++++++-----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py
index 17e793b948..5a3c1a737f 100644
--- a/cura/Settings/IntentManager.py
+++ b/cura/Settings/IntentManager.py
@@ -143,7 +143,6 @@ class IntentManager(QObject):
                 extruder_stack.intent = intent[0]
             else:
                 extruder_stack.intent = self.getDefaultIntent()
-
         application.getMachineManager().setQualityGroupByQualityType(quality_type)
         if old_intent_category != intent_category:
             self.intentCategoryChanged.emit()
diff --git a/tests/Settings/TestContainerManager.py b/tests/Settings/TestContainerManager.py
index f4aa140b6b..ff23b727e6 100644
--- a/tests/Settings/TestContainerManager.py
+++ b/tests/Settings/TestContainerManager.py
@@ -2,7 +2,7 @@ from unittest import TestCase
 from unittest.mock import MagicMock
 
 from PyQt5.QtCore import QUrl
-
+from unittest.mock import patch
 from UM.MimeTypeDatabase import MimeTypeDatabase
 from cura.Settings.ContainerManager import ContainerManager
 import tempfile
@@ -42,20 +42,23 @@ class TestContainerManager(TestCase):
         MimeTypeDatabase.removeMimeType(self._mocked_mime)
 
     def test_getContainerMetaDataEntry(self):
-        assert self._container_manager.getContainerMetaDataEntry("test", "test_data") == "omg"
-        assert self._container_manager.getContainerMetaDataEntry("test", "entry_that_is_not_defined") == ""
+        with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=self._application)):
+            assert self._container_manager.getContainerMetaDataEntry("test", "test_data") == "omg"
+            assert self._container_manager.getContainerMetaDataEntry("test", "entry_that_is_not_defined") == ""
 
     def test_clearUserContainer(self):
-        self._container_manager.clearUserContainers()
+        with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=self._application)):
+            self._container_manager.clearUserContainers()
         assert self._machine_manager.activeMachine.userChanges.clear.call_count == 1
 
     def test_getContainerNameFilters(self):
-        # If nothing is added, we still expect to get the all files filter
-        assert self._container_manager.getContainerNameFilters("") == ['All Files (*)']
+        with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=self._application)):
+            # If nothing is added, we still expect to get the all files filter
+            assert self._container_manager.getContainerNameFilters("") == ['All Files (*)']
 
-        # Pretend that a new type was added.
-        self._container_registry.getContainerTypes = MagicMock(return_value=[("None", None)])
-        assert self._container_manager.getContainerNameFilters("") == ['UnitTest! (*.omg)', 'All Files (*)']
+            # Pretend that a new type was added.
+            self._container_registry.getContainerTypes = MagicMock(return_value=[("None", None)])
+            assert self._container_manager.getContainerNameFilters("") == ['UnitTest! (*.omg)', 'All Files (*)']
 
     def test_exportContainerUnknownFileType(self):
         # The filetype is not known, so this should cause an error!
@@ -69,8 +72,9 @@ class TestContainerManager(TestCase):
         assert self._container_manager.exportContainer("", "whatever", "whatever")["status"] == "error"
 
     def test_exportContainer(self):
-        with tempfile.TemporaryDirectory() as tmpdirname:
-            result = self._container_manager.exportContainer("test", "whatever", os.path.join(tmpdirname, "whatever.omg"))
-            assert(os.path.exists(result["path"]))
-            with open(result["path"], "r", encoding="utf-8") as f:
-                assert f.read() == self._mocked_container_data
+        with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=self._application)):
+            with tempfile.TemporaryDirectory() as tmpdirname:
+                result = self._container_manager.exportContainer("test", "whatever", os.path.join(tmpdirname, "whatever.omg"))
+                assert(os.path.exists(result["path"]))
+                with open(result["path"], "r", encoding="utf-8") as f:
+                    assert f.read() == self._mocked_container_data
\ No newline at end of file