Skip to content

Commit

Permalink
Fixed some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
GimLala committed Apr 20, 2024
1 parent 9e68f5b commit 935350d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
1 change: 1 addition & 0 deletions pygame_gui/elements/ui_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def __init__(self,
self.section_label_height = 30
self.field_height = 40
self.large_field_height = 80
self.selection_list_height = -1
self.gap = 10
self.label_gap = 0
self.section_gap = 15
Expand Down
23 changes: 13 additions & 10 deletions tests/test_elements/test_ui_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,34 +59,34 @@ def test_add_element(self, _init_pygame, default_ui_manager: IUIManagerInterface
_display_surface_return_none):
container = UIForm(pygame.Rect(100, 100, 200, 200), questionnaire=get_questionnaire(),
manager=default_ui_manager)
assert len(container.get_container().elements) == 20
assert len(container.get_container().elements) == 16

button = UIButton(relative_rect=pygame.Rect(0, 0, 50, 50), text="",
manager=default_ui_manager)
default_ui_manager.get_root_container().remove_element(button)
container.get_container().add_element(button)
assert len(container.get_container().elements) == 21
assert len(container.get_container().elements) == 17

button = UIButton(relative_rect=pygame.Rect(0, 0, 50, 250), text="",
manager=default_ui_manager)
default_ui_manager.get_root_container().remove_element(button)
container.get_container().add_element(button)
container.scrollable_container.update(0.4)
container.update(0.4)
assert len(container.get_container().elements) == 22
assert len(container.get_container().elements) == 18

def test_remove_element(self, _init_pygame, default_ui_manager: IUIManagerInterface,
_display_surface_return_none):
container = UIForm(pygame.Rect(100, 100, 200, 200), questionnaire=get_questionnaire(),
manager=default_ui_manager)
assert len(container.get_container().elements) == 20
assert len(container.get_container().elements) == 16

button = UIButton(relative_rect=pygame.Rect(0, 0, 50, 50), text="",
manager=default_ui_manager,
container=container)

container.get_container().remove_element(button)
assert len(container.get_container().elements) == 20
assert len(container.get_container().elements) == 16

def test_set_position(self, _init_pygame, default_ui_manager,
_display_surface_return_none):
Expand Down Expand Up @@ -292,9 +292,13 @@ def test_get_current_values(self, _init_pygame, default_ui_manager: IUIManagerIn

assert container.get_current_values() == {'Character Test:': '', 'Short Text Test:': '', 'Long Text Test:': '',
'Integer Test:': 0, 'Decimal Test:': 0.0, 'Password Test:': '',
'Boolean Test:': True, 'UITextEntryLine Test': '',
'UITextEntryBox Test': '', 'UISelectionList Test': None,
'UIDropDownMenu Test': 'item 1'}
'Boolean Test:': True,
'Section Test:': {
'UITextEntryLine Test': '',
'UITextEntryBox Test': '', 'UISelectionList Test': None,
'UIDropDownMenu Test': 'item 1'
}
}

container.kill()

Expand Down Expand Up @@ -428,7 +432,7 @@ def test_get_current_values(self, _init_pygame, default_ui_manager: IUIManagerIn
button = element.current_state.open_button
default_ui_manager.mouse_position = element.rect.center
default_ui_manager.process_events(
pygame.event.Event(pygame_gui.UI_BUTTON_PRESSED, {"button": pygame.BUTTON_LEFT, 'ui_element': button,
pygame.event.Event(pygame_gui.UI_BUTTON_PRESSED, {"mouse_button": pygame.BUTTON_LEFT, 'ui_element': button,
'ui_object_id': button.most_specific_combined_id})
)

Expand Down Expand Up @@ -495,7 +499,6 @@ def test_type_checker(self, _init_pygame, default_ui_manager,

def test_type_checker_bad_values(self, _init_pygame, default_ui_manager,
_display_surface_return_none):

# General

with pytest.raises(ValueError, match="Question type 'unknown' is not supported"):
Expand Down

0 comments on commit 935350d

Please sign in to comment.