GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 03:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the failing tests

Browse Source 
CURA-6255
This commit is contained in:
Jaime van Kessel 2020-01-02 11:13:48 +01:00
parent bb34094eb2
commit 9de2b39d38
No known key found for this signature in database
GPG Key ID: 3710727397403C91
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/Settings/TestSettingVisibilityPresets.py
View File

@ -1,4 +1,4 @@
from unittest.mock import MagicMock from unittest.mock import MagicMock, patch
import os.path import os.path
@ -28,8 +28,8 @@ def test_createVisibilityPresetFromLocalFile():
def test_visibilityFromPrevious(): def test_visibilityFromPrevious():
# This test checks that all settings in basic are in advanced and all settings in advanced are in expert. # This test checks that all settings in basic are in advanced and all settings in advanced are in expert.
with patch("cura.CuraApplication.CuraApplication.getInstance"):
visibility_model = SettingVisibilityPresetsModel(Preferences()) visibility_model = SettingVisibilityPresetsModel(Preferences())
basic_visibility = visibility_model.getVisibilityPresetById("basic") basic_visibility = visibility_model.getVisibilityPresetById("basic")
advanced_visibility = visibility_model.getVisibilityPresetById("advanced") advanced_visibility = visibility_model.getVisibilityPresetById("advanced")
@ -46,7 +46,8 @@ def test_visibilityFromPrevious():
def test_setActivePreset(): def test_setActivePreset():
preferences = Preferences() preferences = Preferences()
visibility_model = SettingVisibilityPresetsModel(preferences) with patch("cura.CuraApplication.CuraApplication.getInstance"):
visibility_model = SettingVisibilityPresetsModel(preferences)
visibility_model.activePresetChanged = MagicMock() visibility_model.activePresetChanged = MagicMock()
# Ensure that we start off with basic (since we didn't change anyting just yet!) # Ensure that we start off with basic (since we didn't change anyting just yet!)
assert visibility_model.activePreset == "basic" assert visibility_model.activePreset == "basic"
@ -71,13 +72,13 @@ def test_preferenceChanged():
preferences = Preferences() preferences = Preferences()
# Set the visible_settings to something silly # Set the visible_settings to something silly
preferences.addPreference("general/visible_settings", "omgzomg") preferences.addPreference("general/visible_settings", "omgzomg")
visibility_model = SettingVisibilityPresetsModel(preferences) with patch("cura.CuraApplication.CuraApplication.getInstance"):
visibility_model = SettingVisibilityPresetsModel(preferences)
visibility_model.activePresetChanged = MagicMock() visibility_model.activePresetChanged = MagicMock()
assert visibility_model.activePreset == "custom" # This should make the model start at "custom assert visibility_model.activePreset == "custom" # This should make the model start at "custom
assert visibility_model.activePresetChanged.emit.call_count == 0 assert visibility_model.activePresetChanged.emit.call_count == 0
basic_visibility = visibility_model.getVisibilityPresetById("basic") basic_visibility = visibility_model.getVisibilityPresetById("basic")
new_visibility_string = ";".join(basic_visibility.settings) new_visibility_string = ";".join(basic_visibility.settings)
preferences.setValue("general/visible_settings", new_visibility_string) preferences.setValue("general/visible_settings", new_visibility_string)