From b5246a54e8b77cdfb98cefe567ca07dbfc09f3a7 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Tue, 30 Aug 2022 10:33:01 +0100
Subject: [PATCH] test fixes

---
 tests/test_arrange.py        | 32 ++++++++------------------------
 tests/test_layouts_center.py |  9 ++-------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/tests/test_arrange.py b/tests/test_arrange.py
index 16680cc68..580d68e02 100644
--- a/tests/test_arrange.py
+++ b/tests/test_arrange.py
@@ -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)
diff --git a/tests/test_layouts_center.py b/tests/test_layouts_center.py
index 52cbd0cc6..fecd97dcd 100644
--- a/tests/test_layouts_center.py
+++ b/tests/test_layouts_center.py
@@ -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