mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-11 00:37:50 -06:00
Rename function name and fix tests
CURA-6597
This commit is contained in:
parent
f086c1eb11
commit
8863516aa4
3 changed files with 13 additions and 13 deletions
|
@ -53,7 +53,7 @@ class IntentModel(ListModel):
|
|||
return
|
||||
quality_groups = quality_manager.getQualityGroups(global_stack)
|
||||
|
||||
for intent_category, quality_type in IntentManager.getInstance().currentAvailableIntents():
|
||||
for intent_category, quality_type in IntentManager.getInstance().getCurrentAvailableIntents():
|
||||
if intent_category == self._intent_category:
|
||||
new_items.append({"name": quality_groups[quality_type].name, "quality_type": quality_type})
|
||||
if self._intent_category == "default": #For Default we always list all quality types. We can't filter on available profiles since the empty intent is not a specific quality type.
|
||||
|
|
|
@ -67,7 +67,7 @@ class IntentManager(QObject):
|
|||
#
|
||||
# \return A list of tuples of intent_category and quality_type. The actual
|
||||
# instance may vary per extruder.
|
||||
def currentAvailableIntents(self) -> List[Tuple[str, str]]:
|
||||
def getCurrentAvailableIntents(self) -> List[Tuple[str, str]]:
|
||||
application = cura.CuraApplication.CuraApplication.getInstance()
|
||||
global_stack = application.getGlobalContainerStack()
|
||||
if global_stack is None:
|
||||
|
|
|
@ -83,6 +83,7 @@ def doSetup(application, extruder_manager, quality_manager, container_registry,
|
|||
extruder_stack_b.variant = MockContainer({"name": "AA 0.4"})
|
||||
extruder_stack_b.material = MockContainer({"base_file": "generic_pla"})
|
||||
|
||||
application.getGlobalContainerStack().extruderList = [extruder_stack_a, extruder_stack_b]
|
||||
extruder_manager.getUsedExtruderStacks = MagicMock(return_value = [extruder_stack_a, extruder_stack_b])
|
||||
|
||||
|
||||
|
@ -98,13 +99,12 @@ def test_intentCategories(application, intent_manager, container_registry):
|
|||
assert "smooth" in categories, "smooth should be in categories"
|
||||
|
||||
|
||||
def test_currentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack):
|
||||
def test_getCurrentAvailableIntents(application, extruder_manager, quality_manager, intent_manager, container_registry, global_stack):
|
||||
doSetup(application, extruder_manager, quality_manager, container_registry, global_stack)
|
||||
|
||||
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)):
|
||||
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)):
|
||||
with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)):
|
||||
intents = intent_manager.currentAvailableIntents()
|
||||
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)):
|
||||
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
|
||||
intents = intent_manager.getCurrentAvailableIntents()
|
||||
assert ("smooth", "normal") in intents
|
||||
assert ("strong", "abnorm") in intents
|
||||
#assert ("default", "normal") in intents # Pending to-do in 'IntentManager'.
|
||||
|
@ -131,7 +131,7 @@ def test_selectIntent(application, extruder_manager, quality_manager, intent_man
|
|||
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)):
|
||||
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)):
|
||||
with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance", MagicMock(return_value=extruder_manager)):
|
||||
intents = intent_manager.currentAvailableIntents()
|
||||
intents = intent_manager.getCurrentAvailableIntents()
|
||||
for intent, quality in intents:
|
||||
intent_manager.selectIntent(intent, quality)
|
||||
extruder_stacks = extruder_manager.getUsedExtruderStacks()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue