3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix container types of mock containers in fallthrough

Browse source 
It needs to create a container of each type or else setting the container will raise alarm.

Contributes to issue CURA-3497.
This commit is contained in:
Ghostkeeper 2017-04-07 16:41:02 +02:00
parent 4dfc86d5bb
commit f4fcb50a4f
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

65
tests/Settings/TestGlobalStack.py
View file

@ -7,6 +7,7 @@ import unittest.mock #To monkeypatch some mocks in place of dependencies.
import functools import functools
import cura.Settings.GlobalStack #The module we're testing. import cura.Settings.GlobalStack #The module we're testing.
import cura.Settings.CuraContainerStack #To get the list of container types.
from cura.Settings.Exceptions import TooManyExtrudersError, InvalidContainerError, InvalidOperationError #To test raising these errors. from cura.Settings.Exceptions import TooManyExtrudersError, InvalidContainerError, InvalidOperationError #To test raising these errors.
from UM.Settings.DefinitionContainer import DefinitionContainer #To test against the class DefinitionContainer. from UM.Settings.DefinitionContainer import DefinitionContainer #To test against the class DefinitionContainer.
from UM.Settings.InstanceContainer import InstanceContainer #To test against the class InstanceContainer. from UM.Settings.InstanceContainer import InstanceContainer #To test against the class InstanceContainer.
@ -399,37 +400,43 @@ def test_deserializeMissingContainer(global_stack):
# containers. # containers.
def test_getPropertyFallThrough(global_stack): def test_getPropertyFallThrough(global_stack):
#A few instance container mocks to put in the stack. #A few instance container mocks to put in the stack.
layer_height_5 = unittest.mock.MagicMock() #Sets layer height to 5. mock_layer_heights = {} #For each container type, a mock container that defines layer height to something unique.
layer_height_5.getProperty = lambda key, property: 5 if (key == "layer_height" and property == "value") else None mock_no_settings = {} #For each container type, a mock container that has no settings at all.
layer_height_5.hasProperty = lambda key: key == "layer_height" for type_id, type_name in cura.Settings.CuraContainerStack._ContainerIndexes.IndexTypeMap.items():
layer_height_10 = unittest.mock.MagicMock() #Sets layer height to 10. container = unittest.mock.MagicMock()
layer_height_10.getProperty = lambda key, property: 10 if (key == "layer_height" and property == "value") else None container.getProperty = lambda key, property, type_id = type_id: type_id if (key == "layer_height" and property == "value") else None #Returns the container type ID as layer height, in order to identify it.
layer_height_10.hasProperty = lambda key: key == "layer_height" container.hasProperty = lambda key, property: key == "layer_height"
no_layer_height = unittest.mock.MagicMock() #No settings at all. container.getMetaDataEntry = unittest.mock.MagicMock(return_value = type_name)
no_layer_height.getProperty = lambda key, property: None mock_layer_heights[type_id] = container
no_layer_height.hasProperty = lambda key: False
global_stack.userChanges = no_layer_height container = unittest.mock.MagicMock()
global_stack.qualityChanges = no_layer_height container.getProperty = unittest.mock.MagicMock(return_value = None) #Has no settings at all.
global_stack.quality = no_layer_height container.hasProperty = unittest.mock.MagicMock(return_value = False)
global_stack.material = no_layer_height container.getMetaDataEntry = unittest.mock.MagicMock(return_value = type_name)
global_stack.variant = no_layer_height mock_no_settings[type_id] = container
global_stack.definitionChanges = no_layer_height
global_stack.definition = layer_height_5 #Here it is!
assert global_stack.getProperty("layer_height", "value") == 5 global_stack.userChanges = mock_no_settings[cura.Settings.CuraContainerStack._ContainerIndexes.UserChanges]
global_stack.definitionChanges = layer_height_10 global_stack.qualityChanges = mock_no_settings[cura.Settings.CuraContainerStack._ContainerIndexes.QualityChanges]
assert global_stack.getProperty("layer_height", "value") == 10 global_stack.quality = mock_no_settings[cura.Settings.CuraContainerStack._ContainerIndexes.Quality]
global_stack.variant = layer_height_5 global_stack.material = mock_no_settings[cura.Settings.CuraContainerStack._ContainerIndexes.Material]
assert global_stack.getProperty("layer_height", "value") == 5 global_stack.variant = mock_no_settings[cura.Settings.CuraContainerStack._ContainerIndexes.Variant]
global_stack.material = layer_height_10 global_stack.definitionChanges = mock_no_settings[cura.Settings.CuraContainerStack._ContainerIndexes.DefinitionChanges]
assert global_stack.getProperty("layer_height", "value") == 10 with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against the type checking.
global_stack.quality = layer_height_5 global_stack.definition = mock_layer_heights[cura.Settings.CuraContainerStack._ContainerIndexes.Definition] #There's a layer height in here!
assert global_stack.getProperty("layer_height", "value") == 5
global_stack.qualityChanges = layer_height_10 assert global_stack.getProperty("layer_height", "value") == cura.Settings.CuraContainerStack._ContainerIndexes.Definition
assert global_stack.getProperty("layer_height", "value") == 10 global_stack.definitionChanges = mock_layer_heights[cura.Settings.CuraContainerStack._ContainerIndexes.DefinitionChanges]
global_stack.userChanges = layer_height_5 assert global_stack.getProperty("layer_height", "value") == cura.Settings.CuraContainerStack._ContainerIndexes.DefinitionChanges
assert global_stack.getProperty("layer_height", "value") == 5 global_stack.variant = mock_layer_heights[cura.Settings.CuraContainerStack._ContainerIndexes.Variant]
assert global_stack.getProperty("layer_height", "value") == cura.Settings.CuraContainerStack._ContainerIndexes.Variant
global_stack.material = mock_layer_heights[cura.Settings.CuraContainerStack._ContainerIndexes.Material]
assert global_stack.getProperty("layer_height", "value") == cura.Settings.CuraContainerStack._ContainerIndexes.Material
global_stack.quality = mock_layer_heights[cura.Settings.CuraContainerStack._ContainerIndexes.Quality]
assert global_stack.getProperty("layer_height", "value") == cura.Settings.CuraContainerStack._ContainerIndexes.Quality
global_stack.qualityChanges = mock_layer_heights[cura.Settings.CuraContainerStack._ContainerIndexes.QualityChanges]
assert global_stack.getProperty("layer_height", "value") == cura.Settings.CuraContainerStack._ContainerIndexes.QualityChanges
global_stack.userChanges = mock_layer_heights[cura.Settings.CuraContainerStack._ContainerIndexes.UserChanges]
assert global_stack.getProperty("layer_height", "value") == cura.Settings.CuraContainerStack._ContainerIndexes.UserChanges
def test_getPropertyWithResolve(global_stack): def test_getPropertyWithResolve(global_stack):
#Define some containers for the stack. #Define some containers for the stack.