mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-20 05:07:50 -06:00
Merge branch 'feature_intent' into feature_intent_container_tree
Conflicts: .gitlab-ci.yml cura/Machines/MaterialManager.py cura/Machines/VariantManager.py cura/Settings/ContainerManager.py cura/Settings/MachineManager.py tests/TestMachineManager.py
This commit is contained in:
commit
6a8e1557c3
1383 changed files with 33204 additions and 35215 deletions
|
@ -1,11 +1,10 @@
|
|||
from unittest.mock import MagicMock
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
from cura.Machines.QualityChangesGroup import QualityChangesGroup
|
||||
from cura.Machines.QualityManager import QualityManager
|
||||
|
||||
|
||||
|
||||
mocked_stack = MagicMock()
|
||||
mocked_extruder = MagicMock()
|
||||
|
||||
|
@ -31,6 +30,8 @@ def container_registry():
|
|||
{"id": "test_material", "definition": "fdmprinter", "quality_type": "normal", "name": "test_name_material", "material": "base_material", "type": "quality"},
|
||||
{"id": "quality_changes_id", "definition": "fdmprinter", "type": "quality_changes", "quality_type": "amazing!", "name": "herp"}]
|
||||
result.findContainersMetadata = MagicMock(return_value = mocked_metadata)
|
||||
|
||||
result.uniqueName = MagicMock(return_value = "uniqueName")
|
||||
return result
|
||||
|
||||
|
||||
|
@ -61,3 +62,73 @@ def test_getQualityChangesGroup(quality_mocked_application):
|
|||
manager.initialize()
|
||||
|
||||
assert "herp" in manager.getQualityChangesGroups(mocked_stack)
|
||||
|
||||
|
||||
@pytest.mark.skip("Doesn't work on remote")
|
||||
def test_getDefaultQualityType(quality_mocked_application):
|
||||
manager = QualityManager(quality_mocked_application)
|
||||
manager.initialize()
|
||||
mocked_stack = MagicMock()
|
||||
mocked_stack.definition.getMetaDataEntry = MagicMock(return_value = "normal")
|
||||
assert manager.getDefaultQualityType(mocked_stack).quality_type == "normal"
|
||||
|
||||
|
||||
def test_createQualityChanges(quality_mocked_application):
|
||||
manager = QualityManager(quality_mocked_application)
|
||||
mocked_quality_changes = MagicMock()
|
||||
manager._createQualityChanges = MagicMock(return_value = mocked_quality_changes)
|
||||
manager.initialize()
|
||||
container_manager = MagicMock()
|
||||
|
||||
manager._container_registry.addContainer = MagicMock() # Side effect we want to check.
|
||||
with patch("cura.Settings.ContainerManager.ContainerManager.getInstance", container_manager):
|
||||
manager.createQualityChanges("derp")
|
||||
assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes)
|
||||
|
||||
|
||||
def test_renameQualityChangesGroup(quality_mocked_application):
|
||||
manager = QualityManager(quality_mocked_application)
|
||||
manager.initialize()
|
||||
|
||||
mocked_container = MagicMock()
|
||||
|
||||
quality_changes_group = QualityChangesGroup("zomg", "beep")
|
||||
quality_changes_group.getAllNodes = MagicMock(return_value = [mocked_container])
|
||||
|
||||
# We need to check for "uniqueName" instead of "NEWRANDOMNAMEYAY" because the mocked registry always returns
|
||||
# "uniqueName" when attempting to generate an unique name.
|
||||
assert manager.renameQualityChangesGroup(quality_changes_group, "NEWRANDOMNAMEYAY") == "uniqueName"
|
||||
assert mocked_container.setName.called_once_with("uniqueName")
|
||||
|
||||
|
||||
def test_duplicateQualityChangesQualityOnly(quality_mocked_application):
|
||||
manager = QualityManager(quality_mocked_application)
|
||||
manager.initialize()
|
||||
mocked_quality = MagicMock()
|
||||
quality_group = MagicMock()
|
||||
quality_group.getAllNodes = MagicMock(return_value = mocked_quality)
|
||||
mocked_quality_changes = MagicMock()
|
||||
|
||||
# Isolate what we want to test (in this case, we're not interested if createQualityChanges does it's job!)
|
||||
manager._createQualityChanges = MagicMock(return_value = mocked_quality_changes)
|
||||
manager._container_registry.addContainer = MagicMock() # Side effect we want to check.
|
||||
|
||||
manager.duplicateQualityChanges("zomg", {"quality_group": quality_group, "quality_changes_group": None})
|
||||
assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes)
|
||||
|
||||
|
||||
def test_duplicateQualityChanges(quality_mocked_application):
|
||||
manager = QualityManager(quality_mocked_application)
|
||||
manager.initialize()
|
||||
mocked_quality = MagicMock()
|
||||
quality_group = MagicMock()
|
||||
quality_group.getAllNodes = MagicMock(return_value = mocked_quality)
|
||||
quality_changes_group = MagicMock()
|
||||
mocked_quality_changes = MagicMock()
|
||||
quality_changes_group.getAllNodes = MagicMock(return_value=[mocked_quality_changes])
|
||||
mocked_quality_changes.duplicate = MagicMock(return_value = mocked_quality_changes)
|
||||
|
||||
manager._container_registry.addContainer = MagicMock() # Side effect we want to check.
|
||||
|
||||
manager.duplicateQualityChanges("zomg", {"quality_group": quality_group, "quality_changes_group": quality_changes_group})
|
||||
assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes)
|
Loading…
Add table
Add a link
Reference in a new issue