From 2c9f3ede54cf7aca8c2fdd8b1e1af437c81aa805 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 13 Apr 2018 14:12:51 +0100
Subject: [PATCH] fix tests and and fixes.

---
 src/Avalonia.Controls/Border.cs                      |  5 ++---
 tests/Avalonia.Controls.UnitTests/BorderTests.cs     |  7 +++----
 .../Presenters/ContentPresenterTests_Layout.cs       | 12 +++++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 6bceba3401..e6846978dc 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -110,9 +110,8 @@ namespace Avalonia.Controls
         {
             if (Child != null)
             {
-                var padding = Padding + BorderThickness;
-                var arrangeRect = new Rect(finalSize).Deflate(padding);
-                Child.Arrange(new Rect(arrangeRect.X, arrangeRect.Y, Math.Max(0, arrangeRect.Width), Math.Max(0, arrangeRect.Height)));                            
+                var padding = Padding + BorderThickness;                
+                Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
             _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);           
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index 4f58e5e780..9d6c838bc3 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -31,17 +31,16 @@ namespace Avalonia.Controls.UnitTests
                 Padding = new Thickness(6),
                 MaxHeight = 12,
                 MaxWidth = 12,
-                Content = content = new Border
+                Child = content = new Border
                 {
                      Height = 0,
                      Width = 0
                 }
             };
-
-            target.Measure(new Size(100, 100));
+            
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(0, 0, 0, 0), content.Bounds);
+            Assert.Equal(new Rect(6, 6, 0, 0), content.Bounds);
         }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
index d88716279a..2c1074aa9a 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
@@ -217,21 +217,23 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Border content;
             var target = new ContentPresenter
             {
-                Padding = 32,
+                Padding = new Thickness(32),
                 MaxHeight = 32,
                 MaxWidth = 32,
+                HorizontalContentAlignment = HorizontalAlignment.Center,
+                VerticalContentAlignment = VerticalAlignment.Center,
                 Content = content = new Border
                 {
-                    MinWidth = 16,
-                    MinHeight = 16,                    
+                    Height = 0,
+                    Width = 0,
                 },
             };
 
             target.UpdateChild();
-            target.Measure(new Size(100, 100));
+
             target.Arrange(new Rect(0, 0, 100, 100));
 
-            Assert.Equal(new Rect(0, 0, 0, 0), content.Bounds);
+            Assert.Equal(new Rect(48, 48, 0, 0), content.Bounds);
         }
     }
 }
\ No newline at end of file