diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2022-02-21 13:52:28 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2022-02-21 13:52:28 +0300 |
| commit | c7d7dd11d143c804d0c1b3ff67fc6f89ed5171e6 (patch) | |
| tree | db5f78d4f88e85e01c408c03d3298c95cd14ebb9 /tests | |
| parent | 28924a1c87032e29306d0fca067bb39abc2accf2 (diff) | |
| parent | 614fe6fd4f0b6370b731c11d3cf5395f788b9ad4 (diff) | |
Merge branch 'master' into PyQt6_upgrade
Conflicts:
cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/TestBuildVolume.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/TestBuildVolume.py b/tests/TestBuildVolume.py index f59d83df5e..7bc629962d 100644 --- a/tests/TestBuildVolume.py +++ b/tests/TestBuildVolume.py @@ -96,7 +96,12 @@ class TestCalculateBedAdhesionSize: self.createAndSetGlobalStack(build_volume) patched_dictionary = self.setting_property_dict.copy() patched_dictionary.update(setting_dict) - patched_dictionary.update({"adhesion_extruder_nr": {"value": 0}}) + patched_dictionary.update({ + "skirt_brim_extruder_nr": {"value": 0}, + "raft_base_extruder_nr": {"value": 0}, + "raft_interface_extruder_nr": {"value": 0}, + "raft_surface_extruder_nr": {"value": 0} + }) with patch.dict(self.setting_property_dict, patched_dictionary): assert build_volume._calculateBedAdhesionSize([]) == result @@ -158,8 +163,9 @@ class TestComputeDisallowedAreasStatic: class TestUpdateRaftThickness: setting_property_dict = {"raft_base_thickness": {"value": 1}, + "raft_interface_layers": {"value": 2}, "raft_interface_thickness": {"value": 1}, - "raft_surface_layers": {"value": 1}, + "raft_surface_layers": {"value": 3}, "raft_surface_thickness": {"value": 1}, "raft_airgap": {"value": 1}, "layer_0_z_overlap": {"value": 1}, @@ -188,7 +194,7 @@ class TestUpdateRaftThickness: assert build_volume.getRaftThickness() == 0 build_volume._updateRaftThickness() - assert build_volume.getRaftThickness() == 3 + assert build_volume.getRaftThickness() == 6 # 1 base layer of 1mm, 2 interface layers of 1mm each, 3 surface layer of 1mm. assert build_volume.raftThicknessChanged.emit.call_count == 1 def test_adhesionIsNotRaft(self, build_volume: BuildVolume): |