test fixes

This commit is contained in:
Will McGugan
2022-08-30 10:33:01 +01:00
parent b64b9eae2e
commit b5246a54e8
2 changed files with 10 additions and 31 deletions

View File

@@ -24,14 +24,10 @@ def test_arrange_dock_top():
container, [child, header], Size(80, 24), Size(80, 24)
)
assert placements == [
WidgetPlacement(Region(0, 0, 80, 1), header, order=TOP_Z, fixed=True),
WidgetPlacement(Region(0, 1, 80, 23), child, order=0, fixed=False),
WidgetPlacement(
region=Region(x=0, y=1, width=80, height=23),
widget=None,
order=0,
fixed=False,
Region(0, 0, 80, 1), Spacing(), header, order=TOP_Z, fixed=True
),
WidgetPlacement(Region(0, 1, 80, 23), Spacing(), child, order=0, fixed=False),
]
assert widgets == {child, header}
assert spacing == Spacing(1, 0, 0, 0)
@@ -48,14 +44,10 @@ def test_arrange_dock_left():
container, [child, header], Size(80, 24), Size(80, 24)
)
assert placements == [
WidgetPlacement(Region(0, 0, 10, 24), header, order=TOP_Z, fixed=True),
WidgetPlacement(Region(10, 0, 70, 24), child, order=0, fixed=False),
WidgetPlacement(
region=Region(x=10, y=0, width=70, height=24),
widget=None,
order=0,
fixed=False,
Region(0, 0, 10, 24), Spacing(), header, order=TOP_Z, fixed=True
),
WidgetPlacement(Region(10, 0, 70, 24), Spacing(), child, order=0, fixed=False),
]
assert widgets == {child, header}
assert spacing == Spacing(0, 0, 0, 10)
@@ -72,14 +64,10 @@ def test_arrange_dock_right():
container, [child, header], Size(80, 24), Size(80, 24)
)
assert placements == [
WidgetPlacement(Region(70, 0, 10, 24), header, order=TOP_Z, fixed=True),
WidgetPlacement(Region(0, 0, 70, 24), child, order=0, fixed=False),
WidgetPlacement(
region=Region(x=0, y=0, width=70, height=24),
widget=None,
order=0,
fixed=False,
Region(70, 0, 10, 24), Spacing(), header, order=TOP_Z, fixed=True
),
WidgetPlacement(Region(0, 0, 70, 24), Spacing(), child, order=0, fixed=False),
]
assert widgets == {child, header}
assert spacing == Spacing(0, 10, 0, 0)
@@ -96,14 +84,10 @@ def test_arrange_dock_bottom():
container, [child, header], Size(80, 24), Size(80, 24)
)
assert placements == [
WidgetPlacement(Region(0, 23, 80, 1), header, order=TOP_Z, fixed=True),
WidgetPlacement(Region(0, 0, 80, 23), child, order=0, fixed=False),
WidgetPlacement(
region=Region(x=0, y=0, width=80, height=23),
widget=None,
order=0,
fixed=False,
Region(0, 23, 80, 1), Spacing(), header, order=TOP_Z, fixed=True
),
WidgetPlacement(Region(0, 0, 80, 23), Spacing(), child, order=0, fixed=False),
]
assert widgets == {child, header}
assert spacing == Spacing(0, 0, 1, 0)

View File

@@ -1,5 +1,5 @@
from textual._layout import WidgetPlacement
from textual.geometry import Region, Size
from textual.geometry import Region, Size, Spacing
from textual.layouts.center import CenterLayout
from textual.widget import Widget
@@ -19,15 +19,10 @@ def test_center_layout():
expected = [
WidgetPlacement(
region=Region(x=25, y=7, width=10, height=5),
margin=Spacing(),
widget=child,
order=0,
fixed=False,
),
WidgetPlacement(
region=Region(x=25, y=7, width=10, height=5),
widget=None,
order=0,
fixed=False,
),
]
assert placements == expected