diff options
author | Ghostkeeper <rubend@tutanota.com> | 2018-06-01 14:32:59 +0300 |
---|---|---|
committer | Ghostkeeper <rubend@tutanota.com> | 2018-06-01 15:53:54 +0300 |
commit | e38228ac246bea8b8b5e0e87f30eccac2a1a6e3c (patch) | |
tree | 52be881dc2ad9738060b201bd918b5f4b19c58b8 /tests | |
parent | a6ffbbde8f0fe5e4accff49f2cc5e1264215cbf1 (diff) |
Remove unused target_container parameter
It's not compatible with ContainerInterface anyway.
Contributes to issue CURA-5330.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Settings/TestExtruderStack.py | 24 | ||||
-rwxr-xr-x | tests/Settings/TestGlobalStack.py | 25 |
2 files changed, 2 insertions, 47 deletions
diff --git a/tests/Settings/TestExtruderStack.py b/tests/Settings/TestExtruderStack.py index ce829da4b3..b418ae4306 100644 --- a/tests/Settings/TestExtruderStack.py +++ b/tests/Settings/TestExtruderStack.py @@ -340,26 +340,4 @@ def test_setPropertyUser(key, property, value, extruder_stack): extruder_stack.setProperty(key, property, value) #The actual test. - extruder_stack.userChanges.setProperty.assert_called_once_with(key, property, value) #Make sure that the user container gets a setProperty call. - -## Tests setting properties on specific containers on the global stack. -@pytest.mark.parametrize("target_container, stack_variable", [ - ("user", "userChanges"), - ("quality_changes", "qualityChanges"), - ("quality", "quality"), - ("material", "material"), - ("variant", "variant") -]) -def test_setPropertyOtherContainers(target_container, stack_variable, extruder_stack): - #Other parameters that don't need to be varied. - key = "layer_height" - property = "value" - value = 0.1337 - #A mock container in the right spot. - container = unittest.mock.MagicMock() - container.getMetaDataEntry = unittest.mock.MagicMock(return_value = target_container) - setattr(extruder_stack, stack_variable, container) #For instance, set global_stack.qualityChanges = container. - - extruder_stack.setProperty(key, property, value, target_container = target_container) #The actual test. - - getattr(extruder_stack, stack_variable).setProperty.assert_called_once_with(key, property, value) #Make sure that the proper container gets a setProperty call. + extruder_stack.userChanges.setProperty.assert_called_once_with(key, property, value) #Make sure that the user container gets a setProperty call.
\ No newline at end of file diff --git a/tests/Settings/TestGlobalStack.py b/tests/Settings/TestGlobalStack.py index 6bf10dd8c1..05c7cf1677 100755 --- a/tests/Settings/TestGlobalStack.py +++ b/tests/Settings/TestGlobalStack.py @@ -481,27 +481,4 @@ def test_setPropertyUser(key, property, value, global_stack): global_stack.setProperty(key, property, value) #The actual test. - global_stack.userChanges.setProperty.assert_called_once_with(key, property, value) #Make sure that the user container gets a setProperty call. - -## Tests setting properties on specific containers on the global stack. -@pytest.mark.parametrize("target_container, stack_variable", [ - ("user", "userChanges"), - ("quality_changes", "qualityChanges"), - ("quality", "quality"), - ("material", "material"), - ("variant", "variant"), - ("definition_changes", "definitionChanges") -]) -def test_setPropertyOtherContainers(target_container, stack_variable, global_stack): - #Other parameters that don't need to be varied. - key = "layer_height" - property = "value" - value = 0.1337 - #A mock container in the right spot. - container = unittest.mock.MagicMock() - container.getMetaDataEntry = unittest.mock.MagicMock(return_value = target_container) - setattr(global_stack, stack_variable, container) #For instance, set global_stack.qualityChanges = container. - - global_stack.setProperty(key, property, value, target_container = target_container) #The actual test. - - getattr(global_stack, stack_variable).setProperty.assert_called_once_with(key, property, value) #Make sure that the proper container gets a setProperty call. + global_stack.userChanges.setProperty.assert_called_once_with(key, property, value) #Make sure that the user container gets a setProperty call.
\ No newline at end of file |