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

Fix the simple create machine test

Browse source
This commit is contained in:
Jaime van Kessel 2019-05-24 16:36:39 +02:00
parent 66d8e41064
commit 76163636a1
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cura/Settings/CuraStackBuilder.py
View file

@ -64,7 +64,6 @@ class CuraStackBuilder:
# Create ExtruderStacks # Create ExtruderStacks
extruder_dict = machine_definition.getMetaDataEntry("machine_extruder_trains") extruder_dict = machine_definition.getMetaDataEntry("machine_extruder_trains")
print(machine_definition, extruder_dict, machine_definition.getMetaDataEntry)
for position in extruder_dict: for position in extruder_dict:
cls.createExtruderStackWithDefaultSetup(new_global_stack, position) cls.createExtruderStackWithDefaultSetup(new_global_stack, position)

22
tests/Settings/TestCuraStackBuilder.py
View file

@ -3,6 +3,7 @@ from unittest.mock import patch, MagicMock
import pytest import pytest
from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.InstanceContainer import InstanceContainer
from cura.Machines.QualityGroup import QualityGroup
from cura.Settings.CuraStackBuilder import CuraStackBuilder from cura.Settings.CuraStackBuilder import CuraStackBuilder
@pytest.fixture @pytest.fixture
@ -43,21 +44,34 @@ def test_createMachineWithUnknownDefinition(application, container_registry):
assert mocked_config_error.addFaultyContainers.called_with("NOPE") assert mocked_config_error.addFaultyContainers.called_with("NOPE")
'''def test_createMachine(application, container_registry, definition_container, global_variant, material_instance_container, quality_container, quality_changes_container): def test_createMachine(application, container_registry, definition_container, global_variant, material_instance_container, quality_container, quality_changes_container):
variant_manager = MagicMock(name = "Variant Manager") variant_manager = MagicMock(name = "Variant Manager")
quality_manager = MagicMock(name = "Quality Manager")
global_variant_node = MagicMock( name = "global variant node") global_variant_node = MagicMock( name = "global variant node")
global_variant_node.getContainer = MagicMock(return_value = global_variant) global_variant_node.getContainer = MagicMock(return_value = global_variant)
variant_manager.getDefaultVariantNode = MagicMock(return_value = global_variant_node) variant_manager.getDefaultVariantNode = MagicMock(return_value = global_variant_node)
quality_group = QualityGroup(name = "zomg", quality_type = "normal")
quality_group.node_for_global = MagicMock(name = "Node for global")
quality_group.node_for_global.getContainer = MagicMock(return_value = quality_container)
quality_manager.getQualityGroups = MagicMock(return_value = {"normal": quality_group})
application.getContainerRegistry = MagicMock(return_value=container_registry) application.getContainerRegistry = MagicMock(return_value=container_registry)
application.getVariantManager = MagicMock(return_value = variant_manager) application.getVariantManager = MagicMock(return_value = variant_manager)
application.getQualityManager = MagicMock(return_value = quality_manager)
application.empty_material_container = material_instance_container application.empty_material_container = material_instance_container
application.empty_quality_container = quality_container application.empty_quality_container = quality_container
application.empty_quality_changes_container = quality_changes_container application.empty_quality_changes_container = quality_changes_container
definition_container.getMetaDataEntry = MagicMock(return_value = {}, name = "blarg") metadata = definition_container.getMetaData()
print("DEF CONT", definition_container) metadata["machine_extruder_trains"] = {}
metadata["preferred_quality_type"] = "normal"
container_registry.addContainer(definition_container) container_registry.addContainer(definition_container)
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)):
assert CuraStackBuilder.createMachine("Whatever", "Test Definition") is None''' machine = CuraStackBuilder.createMachine("Whatever", "Test Definition")
assert machine.quality == quality_container
assert machine.definition == definition_container
assert machine.variant == global_variant