From 6ba79881dfc627dc5dd2b24842f52c1abdd7b402 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Apr 2017 16:38:06 +0200 Subject: [PATCH] Use new container registry functionality for test_setDefinitionByIdExists We can just set the return value of the registry to whatever we like and we'll verify that we got that from the registry and it was put on the stack. Contributes to issue CURA-3497. --- tests/Settings/TestGlobalStack.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Settings/TestGlobalStack.py b/tests/Settings/TestGlobalStack.py index 9b82426a2f..c3b1880397 100644 --- a/tests/Settings/TestGlobalStack.py +++ b/tests/Settings/TestGlobalStack.py @@ -53,6 +53,7 @@ def container_registry(): registry = unittest.mock.MagicMock() registry.return_value = unittest.mock.NonCallableMagicMock() registry.findInstanceContainers = lambda *args, registry = registry, **kwargs: [registry.return_value] + registry.findDefinitionContainers = lambda *args, registry = registry, **kwargs: [registry.return_value] UM.Settings.ContainerRegistry.ContainerRegistry._ContainerRegistry__instance = registry UM.Settings.ContainerStack._containerRegistry = registry @@ -490,8 +491,8 @@ def test_removeContainer(global_stack): ## Tests setting definitions by specifying an ID of a definition that exists. def test_setDefinitionByIdExists(global_stack, container_registry): - with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against type checking the DefinitionContainer. - global_stack.setDefinitionById("some_definition") #The container registry always has a container with the ID. + container_registry.return_value = DefinitionContainer(container_id = "some_definition") + global_stack.setDefinitionById("some_definition") ## Tests setting definitions by specifying an ID of a definition that doesn't # exist.