3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Code style: Space around binary operators

Browse source 
Contributes to issue CURA-6597.
This commit is contained in:
Ghostkeeper 2019-07-04 09:28:23 +02:00
parent 3cce33be6f
commit 168c9db648
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tests/TestIntentManager.py
View file

@ -12,8 +12,8 @@ from tests.Settings.MockContainer import MockContainer
@pytest.fixture() @pytest.fixture()
def quality_manager(application, container_registry, global_stack) -> QualityManager: def quality_manager(application, container_registry, global_stack) -> QualityManager:
application.getGlobalContainerStack = MagicMock(return_value = global_stack) application.getGlobalContainerStack = MagicMock(return_value = global_stack)
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)):
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
manager = QualityManager(application) manager = QualityManager(application)
return manager return manager
@ -24,8 +24,8 @@ def intent_manager(application, extruder_manager, machine_manager, quality_manag
application.getGlobalContainerStack = MagicMock(return_value = global_stack) application.getGlobalContainerStack = MagicMock(return_value = global_stack)
application.getMachineManager = MagicMock(return_value = machine_manager) application.getMachineManager = MagicMock(return_value = machine_manager)
application.getQualityManager = MagicMock(return_value = quality_manager) application.getQualityManager = MagicMock(return_value = quality_manager)
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)):
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
manager = IntentManager() manager = IntentManager()
return manager return manager
@ -65,16 +65,16 @@ def mockFindContainers(**kwargs) -> List[MockContainer]:
def doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) -> None: def doSetup(application, extruder_manager, quality_manager, container_registry, global_stack) -> None:
container_registry.findContainersMetadata = MagicMock(side_effect=mockFindMetadata) container_registry.findContainersMetadata = MagicMock(side_effect = mockFindMetadata)
container_registry.findContainers = MagicMock(side_effect=mockFindContainers) container_registry.findContainers = MagicMock(side_effect = mockFindContainers)
quality_manager.getQualityGroups = MagicMock(return_value=mocked_qualitygroup_metadata) quality_manager.getQualityGroups = MagicMock(return_value = mocked_qualitygroup_metadata)
for _, qualitygroup in mocked_qualitygroup_metadata.items(): for _, qualitygroup in mocked_qualitygroup_metadata.items():
qualitygroup.node_for_global = MagicMock(name="Node for global") qualitygroup.node_for_global = MagicMock(name = "Node for global")
application.getQualityManager = MagicMock(return_value=quality_manager) application.getQualityManager = MagicMock(return_value = quality_manager)
global_stack.definition = MockContainer({"id": "ultimaker3"}) global_stack.definition = MockContainer({"id": "ultimaker3"})
application.getGlobalContainerStack = MagicMock(return_value=global_stack) application.getGlobalContainerStack = MagicMock(return_value = global_stack)
extruder_stack_a = MockContainer({"id": "Extruder The First"}) extruder_stack_a = MockContainer({"id": "Extruder The First"})
extruder_stack_a.variant = MockContainer({"name": "AA 0.4"}) extruder_stack_a.variant = MockContainer({"name": "AA 0.4"})
@ -83,15 +83,15 @@ def doSetup(application, extruder_manager, quality_manager, container_registry,
extruder_stack_b.variant = MockContainer({"name": "AA 0.4"}) extruder_stack_b.variant = MockContainer({"name": "AA 0.4"})
extruder_stack_b.material = MockContainer({"base_file": "generic_pla"}) extruder_stack_b.material = MockContainer({"base_file": "generic_pla"})
extruder_manager.getUsedExtruderStacks = MagicMock(return_value=[extruder_stack_a, extruder_stack_b]) extruder_manager.getUsedExtruderStacks = MagicMock(return_value = [extruder_stack_a, extruder_stack_b])
def test_intentCategories(application, intent_manager, container_registry): def test_intentCategories(application, intent_manager, container_registry):
# Mock .findContainersMetadata so we also test .intentMetadatas (the latter is mostly a wrapper around the former). # Mock .findContainersMetadata so we also test .intentMetadatas (the latter is mostly a wrapper around the former).
container_registry.findContainersMetadata = MagicMock(return_value=mocked_intent_metadata) container_registry.findContainersMetadata = MagicMock(return_value = mocked_intent_metadata)
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)):
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)): with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str] categories = intent_manager.intentCategories("ultimaker3", "AA 0.4", "generic_pla") # type:List[str]
assert "default" in categories, "default should always be in categories" assert "default" in categories, "default should always be in categories"
assert "strong" in categories, "strong should be in categories" assert "strong" in categories, "strong should be in categories"