3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 15:37:27 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Set return value of registry.findContainers in the test

Browse source 
This way we need to mock way less. It's the min-cut.

Contributes to issue CURA-3497.
This commit is contained in:
Ghostkeeper 2017-04-11 16:20:04 +02:00
parent 8dc073f5c8
commit c3ad7d114a
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/Settings/TestGlobalStack.py
View file

@ -52,23 +52,8 @@ class MockContainer:
@pytest.yield_fixture() @pytest.yield_fixture()
def container_registry(): def container_registry():
registry = unittest.mock.MagicMock() registry = unittest.mock.MagicMock()
registry.return_value = unittest.mock.NonCallableMagicMock()
registry.typeMetaData = "registry_mock" registry.findInstanceContainers = lambda *args, registry = registry, **kwargs: [registry.return_value]
def findInstanceContainers(registry, **kwargs):
container_id = kwargs.get("id", "test_container")
return [MockContainer(container_id, registry.typeMetaData)]
registry.findInstanceContainers = functools.partial(findInstanceContainers, registry)
def findContainers(registry, container_type = None, id = None):
if not id:
id = "test_container"
return [MockContainer(id, registry.typeMetaData)]
registry.findContainers = functools.partial(findContainers, registry)
def getEmptyInstanceContainer():
return MockContainer(container_id = "empty")
registry.getEmptyInstanceContainer = getEmptyInstanceContainer
UM.Settings.ContainerRegistry.ContainerRegistry._ContainerRegistry__instance = registry UM.Settings.ContainerRegistry.ContainerRegistry._ContainerRegistry__instance = registry
UM.Settings.ContainerStack._containerRegistry = registry UM.Settings.ContainerStack._containerRegistry = registry
@ -518,8 +503,8 @@ def test_setDefinitionByIdDoesntExist(global_stack):
## Tests setting definition changes by specifying an ID of a container that ## Tests setting definition changes by specifying an ID of a container that
# exists. # exists.
def test_setDefinitionChangesByIdExists(global_stack, container_registry): def test_setDefinitionChangesByIdExists(global_stack, container_registry):
container_registry.typeMetaData = "definition_changes" container_registry.return_value = getInstanceContainer(container_type = "definition_changes")
global_stack.setDefinitionChangesById("some_definition_changes") #The container registry always has a container with the ID. global_stack.setDefinitionChangesById("InstanceContainer")
## Tests setting definition changes by specifying an ID of a container that ## Tests setting definition changes by specifying an ID of a container that
# doesn't exist. # doesn't exist.