Fix the unit test

Previously we would only look at the state, but that isn't the only thing it should look at.
It should override the value of a resolve if it's defined in user changes or QualityChanges.
This commit is contained in:
Jaime van Kessel 2020-08-14 15:41:40 +02:00
parent bc67b057ea
commit 04c216462a
No known key found for this signature in database
GPG Key ID: 3710727397403C91

View File

@ -410,13 +410,13 @@ def test_getPropertyInstancesBeforeResolve(global_stack):
value = unittest.mock.MagicMock() #Sets just the value. value = unittest.mock.MagicMock() #Sets just the value.
value.getProperty = unittest.mock.MagicMock(side_effect = getValueProperty) value.getProperty = unittest.mock.MagicMock(side_effect = getValueProperty)
value.getMetaDataEntry = unittest.mock.MagicMock(return_value = "quality") value.getMetaDataEntry = unittest.mock.MagicMock(return_value = "quality_changes")
resolve = unittest.mock.MagicMock() #Sets just the resolve. resolve = unittest.mock.MagicMock() #Sets just the resolve.
resolve.getProperty = unittest.mock.MagicMock(side_effect = getResolveProperty) resolve.getProperty = unittest.mock.MagicMock(side_effect = getResolveProperty)
with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against the type checking. with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against the type checking.
global_stack.definition = resolve global_stack.definition = resolve
global_stack.quality = value global_stack.qualityChanges = value
assert global_stack.getProperty("material_bed_temperature", "value") == 10 assert global_stack.getProperty("material_bed_temperature", "value") == 10