mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-24 23:23:57 -06:00
Merge 4.4
This commit is contained in:
commit
d70a6e81b1
3 changed files with 32 additions and 2 deletions
|
@ -139,9 +139,33 @@ def test_preferredMaterialExactMatch(empty_variant_node):
|
|||
"some_different_material": MagicMock(getMetaDataEntry = lambda x: 3),
|
||||
"preferred_material": MagicMock(getMetaDataEntry = lambda x: 3) # Exact match.
|
||||
}
|
||||
empty_variant_node.machine.preferred_material = "preferred_material"
|
||||
|
||||
assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material"], "It should match exactly on this one since it's the preferred material."
|
||||
|
||||
## Tests the preferred material when a submaterial is available in the
|
||||
# materials list for this node.
|
||||
def test_preferredMaterialSubmaterial(empty_variant_node):
|
||||
empty_variant_node.materials = {
|
||||
"some_different_material": MagicMock(getMetaDataEntry = lambda x: 3),
|
||||
"preferred_material_base_file_aa04": MagicMock(getMetaDataEntry = lambda x: 3) # This is a submaterial of the preferred material.
|
||||
}
|
||||
empty_variant_node.machine.preferred_material = "preferred_material_base_file_aa04"
|
||||
|
||||
assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_base_file_aa04"], "It should match on the submaterial just as well."
|
||||
|
||||
## Tests the preferred material matching on the approximate diameter of the
|
||||
# filament.
|
||||
def test_preferredMaterialDiameter(empty_variant_node):
|
||||
empty_variant_node.materials = {
|
||||
"some_different_material": MagicMock(getMetaDataEntry = lambda x: 3),
|
||||
"preferred_material_wrong_diameter": MagicMock(getMetaDataEntry = lambda x: 2), # Approximate diameter is 2 instead of 3.
|
||||
"preferred_material_correct_diameter": MagicMock(getMetaDataEntry = lambda x: 3) # Correct approximate diameter.
|
||||
}
|
||||
empty_variant_node.machine.preferred_material = "preferred_material_correct_diameter"
|
||||
|
||||
assert empty_variant_node.preferredMaterial(approximate_diameter = 3) == empty_variant_node.materials["preferred_material_correct_diameter"], "It should match only on the material with correct diameter."
|
||||
|
||||
## Tests the preferred material matching on a different material if the
|
||||
# diameter is wrong.
|
||||
def test_preferredMaterialDiameterNoMatch(empty_variant_node):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue