Modularize tests buttons module #4740
Open
+413
−325
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
bieleluk
force-pushed
the
bieleluk/test-modularization
branch
6 times, most recently
from
4d1eb6c to
0ebb661
Compare
bieleluk
force-pushed
the
bieleluk/test-modularization
branch
from
0ebb661 to
ebe1c59
Compare
bieleluk
changed the title
romanz
requested changes
Mar 6, 2025
| def grid34(x: int, y: int) -> Coords: | ||
| return grid(DISPLAY_WIDTH, 3, x), grid(DISPLAY_HEIGHT, 4, y) | ||
| def grid34(x: int, y: int, layout_type: LayoutType) -> Coords: | ||
| assert layout_type in (LayoutType.Bolt, LayoutType.Delizia) |
There was a problem hiding this comment.
nit: can be removed, since it is also checked in display_width() & display_height().
(here and below)
|
|
||
|
|
||
| # Horizontal coordinates | ||
| def left(layout_type: LayoutType): |
There was a problem hiding this comment.
nit: add return type annotation?
(here and below)
| def grid(dim: int, grid_cells: int, cell: int) -> int: | ||
| step = dim // grid_cells | ||
| ofs = step // 2 | ||
| return cell * step + ofs | ||
|
|
||
|
|
||
| def grid35(x: int, y: int) -> Coords: | ||
| return grid(DISPLAY_WIDTH, 3, x), grid(DISPLAY_HEIGHT, 5, y) | ||
| def grid35(x: int, y: int, layout_type: LayoutType) -> Coords: |
There was a problem hiding this comment.
Maybe it would simpler to add a "Buttons" class, that will have all the functions here as its methods, e.g.:
class Buttons:
def __init__(self, layout_type: LayoutType):
self.width = display_height(layout_type)
self.height = display_height(layout_type)
def grid35(self, x: int, y: int) -> Coords:
return grid(self.width, 3, x), grid(self.height, 5, y)
...
def info(self) -> Coords:
return (self.mid(), self.bottom())
...So that you could do something like:
buttons = Buttons(debug.layout_type) # can be done once
debug.click(buttons.cancel()) # no need to pass layout type :)WDYT?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR prepares
buttonstest module forEckhartlayout support that has a different screen resolution and different buttons positions. This is done by creating functions withlayout_typeparam instead of using constants.On top of that, it refactors
set_selectionfunction to accommodate to this change.