All unit tests pass.

Made TextFormatter have independent Width/Height.

Terminal.Gui/Text/TextFormatter.cs

@@ -17,7 +17,7 @@ public class TextFormatter
     private bool _multiLine;
     private bool _preserveTrailingSpaces;
     private int _tabWidth = 4;
-    private string _text;
+    private string? _text;
     private Alignment _textAlignment = Alignment.Start;
     private TextDirection _textDirection;
     private Alignment _textVerticalAlignment = Alignment.Start;
@@ -49,6 +49,11 @@ public class TextFormatter
             {
                 Size = GetAutoSize ();
             }
+            else
+            {
+                Height = null;
+                Width = null;
+            }
         }
     }
 
@@ -188,13 +193,18 @@ public class TextFormatter
             {
                 return;
             }
+
+            if (value < 0)
+            {
+                throw  new ArgumentOutOfRangeException (nameof (Width), value, @"Must be greater than or equal to 0.");
+            }
+
             _width = value;
             if (_width is null || _height is null)
             {
                 return;
             }
-            Size size = EnableNeedsFormat (Size!.Value);
-            _width = size.Width;
+            _width = EnableNeedsFormat (value);
         }
     }
 
@@ -209,13 +219,18 @@ public class TextFormatter
             {
                 return;
             }
+
+            if (value < 0)
+            {
+                throw new ArgumentOutOfRangeException (nameof (Width), value, @"Must be greater than or equal to 0.");
+            }
+
             _height = value;
             if (_width is null || _height is null)
             {
                 return;
             }
-            Size size = EnableNeedsFormat (Size!.Value);
-            _height = size.Height;
+            _height = EnableNeedsFormat (value);
         }
     }
 
@@ -273,7 +288,7 @@ public class TextFormatter
     /// <summary>The text to be formatted. This string is never modified.</summary>
     public virtual string Text
     {
-        get => _text;
+        get => _text!;
         set
         {
             _text = EnableNeedsFormat (value);
@@ -316,7 +331,7 @@ public class TextFormatter
         Attribute normalColor,
         Attribute hotColor,
         Rectangle maximum = default,
-        ConsoleDriver driver = null
+        ConsoleDriver? driver = null
     )
     {
         // With this check, we protect against subclasses with overrides of Text (like Button)
@@ -788,7 +803,7 @@ public class TextFormatter
     public List<string> GetLines ()
     {
         // With this check, we protect against subclasses with overrides of Text
-        if (string.IsNullOrEmpty (Text) || Size is null || Size?.Height == 0 || Size?.Width == 0)
+        if (string.IsNullOrEmpty (Text) || Width is null || Width == 0 || Height is null || Height == 0)
         {
             _lines = new List<string> { string.Empty };
             NeedsFormat = false;
@@ -798,9 +813,9 @@ public class TextFormatter
 
         if (NeedsFormat)
         {
-            string text = _text;
+            string text = _text!;
 
-            if (FindHotKey (_text, HotKeySpecifier, out _hotKeyPos, out Key newHotKey))
+            if (FindHotKey (_text!, HotKeySpecifier, out _hotKeyPos, out Key newHotKey))
             {
                 HotKey = newHotKey;
                 text = RemoveHotKeySpecifier (Text, _hotKeyPos, HotKeySpecifier);
@@ -813,9 +828,9 @@ public class TextFormatter
 
                 _lines = Format (
                                  text,
-                                 Size!.Value.Height,
+                                 Height.Value,
                                  VerticalAlignment == Alignment.Fill,
-                                 Size!.Value.Width > colsWidth && WordWrap,
+                                 Width.Value > colsWidth && WordWrap,
                                  PreserveTrailingSpaces,
                                  TabWidth,
                                  Direction,
@@ -825,7 +840,7 @@ public class TextFormatter
 
                 if (!AutoSize)
                 {
-                    colsWidth = GetMaxColsForWidth (_lines, Size!.Value.Width, TabWidth);
+                    colsWidth = GetMaxColsForWidth (_lines, Width.Value, TabWidth);
 
                     if (_lines.Count > colsWidth)
                     {
@@ -837,9 +852,9 @@ public class TextFormatter
             {
                 _lines = Format (
                                  text,
-                                 Size!.Value.Width,
+                                 Width.Value,
                                  Alignment == Alignment.Fill,
-                                 Size!.Value.Height > 1 && WordWrap,
+                                 Height.Value > 1 && WordWrap,
                                  PreserveTrailingSpaces,
                                  TabWidth,
                                  Direction,
@@ -847,9 +862,9 @@ public class TextFormatter
                                  this
                                 );
 
-                if (!AutoSize && _lines.Count > Size!.Value.Height)
+                if (!AutoSize && _lines.Count > Height.Value)
                 {
-                    _lines.RemoveRange (Size!.Value.Height, _lines.Count -  Size!.Value.Height);
+                    _lines.RemoveRange (Height.Value, _lines.Count -  Height.Value);
                 }
             }
 
@@ -860,7 +875,7 @@ public class TextFormatter
     }
 
     /// <summary>Event invoked when the <see cref="HotKey"/> is changed.</summary>
-    public event EventHandler<KeyChangedEventArgs> HotKeyChanged;
+    public event EventHandler<KeyChangedEventArgs>? HotKeyChanged;
 
     /// <summary>Sets <see cref="NeedsFormat"/> to <see langword="true"/> and returns the value.</summary>
     /// <typeparam name="T"></typeparam>
@@ -1128,7 +1143,7 @@ public class TextFormatter
         bool preserveTrailingSpaces = false,
         int tabWidth = 0,
         TextDirection textDirection = TextDirection.LeftRight_TopBottom,
-        TextFormatter textFormatter = null
+        TextFormatter? textFormatter = null
     )
     {
         if (width < 0)
@@ -1375,7 +1390,7 @@ public class TextFormatter
         Alignment textAlignment,
         TextDirection textDirection = TextDirection.LeftRight_TopBottom,
         int tabWidth = 0,
-        TextFormatter textFormatter = null
+        TextFormatter? textFormatter = null
     )
     {
         return ClipAndJustify (text, width, textAlignment == Alignment.Fill, textDirection, tabWidth, textFormatter);
@@ -1398,7 +1413,7 @@ public class TextFormatter
         bool justify,
         TextDirection textDirection = TextDirection.LeftRight_TopBottom,
         int tabWidth = 0,
-        TextFormatter textFormatter = null
+        TextFormatter? textFormatter = null
     )
     {
         if (width < 0)
@@ -1619,7 +1634,7 @@ public class TextFormatter
         int tabWidth = 0,
         TextDirection textDirection = TextDirection.LeftRight_TopBottom,
         bool multiLine = false,
-        TextFormatter textFormatter = null
+        TextFormatter? textFormatter = null
     )
     {
         return Format (
@@ -1667,7 +1682,7 @@ public class TextFormatter
         int tabWidth = 0,
         TextDirection textDirection = TextDirection.LeftRight_TopBottom,
         bool multiLine = false,
-        TextFormatter textFormatter = null
+        TextFormatter? textFormatter = null
     )
     {
         if (width < 0)

Terminal.Gui/View/Layout/DimAuto.cs

@@ -63,8 +63,8 @@ public class DimAuto () : Dim
         var maxCalculatedSize = 0;
 
         int autoMin = MinimumContentDim?.GetAnchor (superviewContentSize) ?? 0;
-        int screen = dimension == Dimension.Width ? Application.Screen.Width * 4 : Application.Screen.Height * 4;
-        int autoMax = MaximumContentDim?.GetAnchor (superviewContentSize) ?? screen;
+        int screenX4 = dimension == Dimension.Width ? Application.Screen.Width * 4 : Application.Screen.Height * 4;
+        int autoMax = MaximumContentDim?.GetAnchor (superviewContentSize) ?? screenX4;
 
         Debug.Assert (autoMin <= autoMax, "MinimumContentDim must be less than or equal to MaximumContentDim.");
 
@@ -75,7 +75,7 @@ public class DimAuto () : Dim
             {
                 if (us.TextFormatter.Width is null)
                 {
-                    us.TextFormatter.Size = us.TextFormatter.FormatAndGetSize (new (int.Max (autoMax, superviewContentSize), screen));
+                    us.TextFormatter.Size = us.TextFormatter.FormatAndGetSize (new (int.Min (autoMax, screenX4), screenX4));
                 }
 //                else
                 {
@@ -86,7 +86,7 @@ public class DimAuto () : Dim
             {
                 if (us.TextFormatter.Height is null)
                 {
-                    textSize = us.TextFormatter.FormatAndGetSize (new (us.TextFormatter.Width ?? screen, int.Max (autoMax, superviewContentSize))).Height;
+                    textSize = us.TextFormatter.FormatAndGetSize (new (us.TextFormatter.Width ?? screenX4, int.Min (autoMax, screenX4))).Height;
                     us.TextFormatter.Height = textSize;
                 }
                 else
@@ -241,12 +241,12 @@ public class DimAuto () : Dim
 
                     if (dimension == Dimension.Width)
                     {
-                        int width = v.Width!.Calculate (0, screen, v, dimension);
+                        int width = v.Width!.Calculate (0, screenX4, v, dimension);
                         maxCentered = (v.X.GetAnchor (0) + width);
                     }
                     else
                     {
-                        int height = v.Height!.Calculate (0, screen, v, dimension);
+                        int height = v.Height!.Calculate (0, screenX4, v, dimension);
                         maxCentered = (v.Y.GetAnchor (0) + height);
                     }
                 }
@@ -364,11 +364,11 @@ public class DimAuto () : Dim
                     // Need to set the relative layout for PosAnchorEnd subviews to calculate the size
                     if (dimension == Dimension.Width)
                     {
-                        v.SetRelativeLayout (new Size (maxCalculatedSize, screen));
+                        v.SetRelativeLayout (new Size (maxCalculatedSize, screenX4));
                     }
                     else
                     {
-                        v.SetRelativeLayout (new Size (screen, maxCalculatedSize));
+                        v.SetRelativeLayout (new Size (screenX4, maxCalculatedSize));
                     }
                     maxAnchorEnd = dimension == Dimension.Width ? v.X.GetAnchor (maxCalculatedSize + v.Frame.Width) : v.Y.GetAnchor (maxCalculatedSize + v.Frame.Height);
                 }

Terminal.Gui/View/Layout/DimAutoStyle.cs

@@ -33,6 +33,10 @@ public enum DimAutoStyle
     ///     <para>
     ///         The corresponding dimensions of <see cref="View.GetContentSize ()"/> and/or <see cref="View.Subviews"/> will be ignored.
     ///     </para>
+    ///     <para>
+    ///         If <see cref="DimAuto.MaximumContentDim"/> is set, the dimension will be the maximum of the formatted text and the
+    ///         demension provided by <see cref="DimAuto.MaximumContentDim"/>. Otherwise, the dimension will be that of the formatted text.
+    ///     </para>
     /// </summary>
     Text = 2,
 

Terminal.Gui/View/Layout/ViewLayout.cs

@@ -65,8 +65,6 @@ public partial class View
         // This is the only place where _frame should be set directly. Use Frame = or SetFrame instead.
         _frame = frame;
 
-        SetTextFormatterSize ();
-
         OnViewportChanged (new (IsInitialized ? Viewport : Rectangle.Empty, oldViewport));
     }
 
@@ -235,7 +233,7 @@ public partial class View
                 return;
             }
 
-            if (_height is DimAuto)
+            if (_height is { } && _height.Has (typeof (DimAuto), out _))
             {
                 // Reset ContentSize to Viewport
                 _contentSize = null;
@@ -243,6 +241,9 @@ public partial class View
 
             _height = value ?? throw new ArgumentNullException (nameof (value), @$"{nameof (Height)} cannot be null");
 
+            // Reset TextFormatter - Will be recalculated in SetTextFormatterSize
+            TextFormatter.Height = null;
+
             OnResizeNeeded ();
         }
     }
@@ -280,7 +281,7 @@ public partial class View
                 return;
             }
 
-            if (_width is DimAuto)
+            if (_width is { } && _width.Has (typeof (DimAuto), out _))
             {
                 // Reset ContentSize to Viewport
                 _contentSize = null;
@@ -288,6 +289,9 @@ public partial class View
 
             _width = value ?? throw new ArgumentNullException (nameof (value), @$"{nameof (Width)} cannot be null");
 
+            // Reset TextFormatter - Will be recalculated in SetTextFormatterSize
+            TextFormatter.Width = null;
+
             OnResizeNeeded ();
         }
     }
@@ -576,7 +580,6 @@ public partial class View
         SetTextFormatterSize ();
 
         int newX, newW, newY, newH;
-        Rectangle oldFrame = Frame;
 
         // Calculate the new X, Y, Width, and Height
         // If the Width or Height is Dim.Auto, calculate the Width or Height first. Otherwise, calculate the X or Y first.
@@ -584,7 +587,6 @@ public partial class View
         {
             newW = _width.Calculate (0, superviewContentSize.Width, this, Dimension.Width);
             newX = _x.Calculate (superviewContentSize.Width, newW, this, Dimension.Width);
-            //SetFrame (oldFrame with { X = newX, Width = newW });
         }
         else
         {
@@ -603,8 +605,6 @@ public partial class View
             newH = _height.Calculate (newY, superviewContentSize.Height, this, Dimension.Height);
         }
 
-        SetFrame (oldFrame);
-
         Rectangle newFrame = new (newX, newY, newW, newH);
 
         if (Frame != newFrame)
@@ -636,9 +636,21 @@ public partial class View
             {
                 SetTitleTextFormatterSize ();
             }
+
             SetNeedsLayout ();
             SetNeedsDisplay ();
         }
+
+        if (TextFormatter.Width is null)
+        {
+            TextFormatter.Width = GetContentSize ().Width;
+        }
+
+        if (TextFormatter.Height is null)
+        {
+            TextFormatter.Height = GetContentSize ().Height;
+        }
+
     }
 
 
@@ -671,7 +683,7 @@ public partial class View
 
         LayoutAdornments ();
 
-        SetTextFormatterSize ();
+        //SetTextFormatterSize ();
 
         // Sort out the dependencies of the X, Y, Width, Height properties
         HashSet<View> nodes = new ();
@@ -747,7 +759,6 @@ public partial class View
                            Application.Top is { } && Application.Top != this && Application.Top.IsInitialized ? Application.Top.GetContentSize () :
                            Application.Screen.Size;
 
-        SetTextFormatterSize ();
         SetRelativeLayout (superViewContentSize);
 
         if (IsInitialized)

Terminal.Gui/View/ViewText.cs

@@ -1,5 +1,6 @@
 #nullable enable
 
+using System.Diagnostics;
 using static Unix.Terminal.Curses;
 
 namespace Terminal.Gui;
@@ -88,6 +89,7 @@ public partial class View
     /// </summary>
     public event EventHandler? TextChanged;
 
+    // TODO: Make this non-virtual. Nobody overrides it.
     /// <summary>
     ///     Gets or sets how the View's <see cref="Text"/> is aligned horizontally when drawn. Changing this property will
     ///     redisplay the <see cref="View"/>.
@@ -107,6 +109,7 @@ public partial class View
         }
     }
 
+    // TODO: Make this non-virtual. Nobody overrides it.
     /// <summary>
     ///     Gets or sets the direction of the View's <see cref="Text"/>. Changing this property will redisplay the
     ///     <see cref="View"/>.
@@ -118,11 +121,7 @@ public partial class View
     public virtual TextDirection TextDirection
     {
         get => TextFormatter.Direction;
-        set
-        {
-            UpdateTextDirection (value);
-            TextFormatter.Direction = value;
-        }
+        set => UpdateTextDirection (value);
     }
 
     /// <summary>
@@ -130,6 +129,7 @@ public partial class View
     /// </summary>
     public TextFormatter TextFormatter { get; init; } = new () { };
 
+    // TODO: Make this non-virtual. Nobody overrides it.
     /// <summary>
     ///     Gets or sets how the View's <see cref="Text"/> is aligned vertically when drawn. Changing this property will
     ///     redisplay
@@ -149,6 +149,7 @@ public partial class View
         }
     }
 
+    // TODO: Add a OnUpdateTextFormatterText method that invokes UpdateTextFormatterText so that overrides don't have to call base.
     /// <summary>
     ///     Can be overridden if the <see cref="Terminal.Gui.TextFormatter.Text"/> has
     ///     different format than the default.
@@ -158,6 +159,8 @@ public partial class View
         if (TextFormatter is { })
         {
             TextFormatter.Text = _text;
+            TextFormatter.Width = null;
+            TextFormatter.Height = null;
         }
     }
 
@@ -178,7 +181,7 @@ public partial class View
         UpdateTextFormatterText ();
 
         // Default is to use GetContentSize ().
-        var size = GetContentSize ();
+        Size? size = _contentSize;
 
         // TODO: This is a hack. Figure out how to move this logic into DimAuto
         // Use _width & _height instead of Width & Height to avoid debug spew
@@ -188,15 +191,24 @@ public partial class View
         {
             TextFormatter.Width = null;
         }
+        else
+        {
+            if (size is { })
+            {
+                TextFormatter.Width = size?.Width;
+            }
+        }
 
         if ((heightAuto is { } && heightAuto.Style.FastHasFlags (DimAutoStyle.Text)))
         {
             TextFormatter.Height = null;
         }
-
-        if (TextFormatter.Size is { })
+        else
         {
-            TextFormatter.Size = size;
+            if (size is { })
+            {
+                TextFormatter.Height = size?.Height;
+            }
         }
     }
 
@@ -209,10 +221,11 @@ public partial class View
 
         if (directionChanged)
         {
+            TextFormatter.Width = null;
+            TextFormatter.Height = null;
             OnResizeNeeded ();
         }
 
-        SetTextFormatterSize ();
         SetNeedsDisplay ();
     }
 }

Terminal.Gui/Views/Button.cs

@@ -170,6 +170,7 @@ public class Button : View, IDesignable
     /// <inheritdoc/>
     protected override void UpdateTextFormatterText ()
     {
+        base.UpdateTextFormatterText();
         if (NoDecorations)
         {
             TextFormatter.Text = Text;

Terminal.Gui/Views/CheckBox.cs

@@ -182,6 +182,7 @@ public class CheckBox : View
     /// <inheritdoc/>
     protected override void UpdateTextFormatterText ()
     {
+        base.UpdateTextFormatterText();
         switch (TextAlignment)
         {
             case Alignment.Start:

Terminal.Gui/Views/ScrollView.cs

@@ -623,7 +623,6 @@ public class ScrollView : View
         {
             _horizontal.Position = Math.Max (0, -_contentOffset.X);
         }
-
         SetNeedsDisplay ();
     }
 

UnitTests/View/Layout/Dim.AutoTests.PosTypes.cs

@@ -306,7 +306,7 @@ public partial class DimAutoTests
     [Theory]
     [InlineData (0, 10, 0, 10, 10, 2)]
     [InlineData (0, 5, 0, 5, 5, 3)] // max width of 5 should cause wordwrap at 5 giving a height of 2 + 1
-    //[InlineData (0, 19, 0, 9, 19, 9)]
+    [InlineData (0, 19, 0, 9, 11, 2)]
     //[InlineData (0, 20, 0, 10, 20, 10)]
     //[InlineData (0, 21, 0, 11, 21, 11)]
     //[InlineData (1, 21, 1, 11, 21, 11)]

UnitTests/View/Layout/Dim.AutoTests.cs

@@ -528,6 +528,25 @@ public partial class DimAutoTests (ITestOutputHelper output)
 
     #region DimAutoStyle.Auto tests
 
+    [Theory]
+    [InlineData ("", 0, 0)]
+    [InlineData (" ", 1, 1)]
+    [InlineData ("01234", 5, 1)]
+    [InlineData ("01234\nABCDE", 5, 2)]
+    public void DimAutoStyle_Auto_JustText_Sizes_Correctly (string text, int expectedW, int expectedH)
+    {
+        var view = new View ();
+        view.Width = Auto ();
+        view.Height = Auto ();
+
+        view.Text = text;
+
+        view.SetRelativeLayout (Application.Screen.Size);
+
+        Assert.Equal (new (expectedW, expectedH), view.Frame.Size);
+
+    }
+
     [Fact]
     public void DimAutoStyle_Auto_Text_Size_Is_Used ()
     {
@@ -622,6 +641,7 @@ public partial class DimAutoTests (ITestOutputHelper output)
     [InlineData ("", 0, 0)]
     [InlineData (" ", 1, 1)]
     [InlineData ("01234", 5, 1)]
+    [InlineData ("01234\nABCDE", 5, 2)]
     public void DimAutoStyle_Text_Sizes_Correctly (string text, int expectedW, int expectedH)
     {
         var view = new View ();
@@ -677,7 +697,10 @@ public partial class DimAutoTests (ITestOutputHelper output)
     [InlineData ("", 0, 0)]
     [InlineData (" ", 1, 1)]
     [InlineData ("01234", 5, 1)]
-    public void DimAutoStyle_Text_Ignores_ContentSize (string text, int expectedW, int expectedH)
+    [InlineData ("01234ABCDE", 10, 1)]
+    [InlineData ("01234\nABCDE", 5, 2)]
+
+    public void DimAutoStyle_Text_NoMin_Not_Constrained_By_ContentSize (string text, int expectedW, int expectedH)
     {
         var view = new View ();
         view.Width = Auto (DimAutoStyle.Text);
@@ -688,6 +711,31 @@ public partial class DimAutoTests (ITestOutputHelper output)
         Assert.Equal (new (expectedW, expectedH), view.Frame.Size);
     }
 
+
+    [Theory]
+    [InlineData ("", 0, 0)]
+    [InlineData (" ", 1, 1)]
+    [InlineData ("01234", 5, 1)]
+    [InlineData ("01234ABCDE", 10, 1)]
+    [InlineData ("01234\nABCDE", 5, 2)]
+    public void DimAutoStyle_Text_NoMin_Not_Constrained_By_SuperView (string text, int expectedW, int expectedH)
+    {
+        var superView = new View ()
+        {
+            Width = 1, Height = 1
+        };
+
+        var view = new View ();
+
+        view.Width = Auto (DimAutoStyle.Text);
+        view.Height = Auto (DimAutoStyle.Text);
+        view.Text = text;
+        superView.Add (view);
+
+        superView.SetRelativeLayout (Application.Screen.Size);
+        Assert.Equal (new (expectedW, expectedH), view.Frame.Size);
+    }
+
     [Fact]
     public void DimAutoStyle_Text_Pos_AnchorEnd_Locates_Correctly ()
     {
@@ -902,7 +950,8 @@ public partial class DimAutoTests (ITestOutputHelper output)
             Height = 1,
             Width = Auto ()
         };
-        Assert.Equal (new (expected, 1), view.TextFormatter.Size);
+        Assert.Equal (expected, view.TextFormatter.Width);
+        Assert.Equal (1, view.TextFormatter.Height);
     }
 
     [Theory]
@@ -917,7 +966,8 @@ public partial class DimAutoTests (ITestOutputHelper output)
             Width = Auto (),
             Height = 1
         };
-        Assert.Equal (new (expected, 1), view.TextFormatter.Size);
+        Assert.Equal (expected, view.TextFormatter.Width);
+        Assert.Equal (1, view.TextFormatter.Height);
 
         view = new ()
         {
@@ -927,7 +977,8 @@ public partial class DimAutoTests (ITestOutputHelper output)
             Width = 1,
             Height = Auto ()
         };
-        Assert.Equal (new (1, expected), view.TextFormatter.Size);
+        Assert.Equal (1, view.TextFormatter.Width);
+        Assert.Equal (expected, view.TextFormatter.Height);
     }
 
     // Test variations of Frame

UnitTests/Views/ButtonTests.cs

@@ -76,11 +76,9 @@ public class ButtonTests (ITestOutputHelper output)
     [InlineData (10, 3, 10, 3)]
     public void Button_AbsoluteSize_DefaultText (int width, int height, int expectedWidth, int expectedHeight)
     {
-        var btn1 = new Button
-        {
-            Width = width,
-            Height = height,
-        };
+        var btn1 = new Button ();
+        btn1.Width = width;
+        btn1.Height = height;
 
         Assert.Equal (new Size (expectedWidth, expectedHeight), btn1.Frame.Size);
         Assert.Equal (new Size (expectedWidth, expectedHeight), btn1.Viewport.Size);

UnitTests/Views/ScrollViewTests.cs

@@ -349,7 +349,7 @@ public class ScrollViewTests (ITestOutputHelper output)
         Assert.True (sv.AutoHideScrollBars);
         Assert.True (sv.KeepContentAlwaysInViewport);
 
-        sv = new() { X = 1, Y = 2, Width = 20, Height = 10 };
+        sv = new () { X = 1, Y = 2, Width = 20, Height = 10 };
         Assert.True (sv.CanFocus);
         Assert.Equal (new (1, 2, 20, 10), sv.Frame);
         Assert.Equal (Point.Empty, sv.ContentOffset);
@@ -364,7 +364,7 @@ public class ScrollViewTests (ITestOutputHelper output)
     {
         ((FakeDriver)Application.Driver).SetBufferSize (30, 30);
 
-        var top = new View { Width = 30, Height = 30, ColorScheme = new() { Normal = Attribute.Default } };
+        var top = new View { Width = 30, Height = 30, ColorScheme = new () { Normal = Attribute.Default } };
 
         Size size = new (20, 10);
 
@@ -374,7 +374,7 @@ public class ScrollViewTests (ITestOutputHelper output)
             Y = 1,
             Width = 10,
             Height = 5,
-            ColorScheme = new() { Normal = new (Color.Red, Color.Green) }
+            ColorScheme = new () { Normal = new (Color.Red, Color.Green) }
         };
         sv.SetContentSize (size);
         string text = null;
@@ -391,7 +391,7 @@ public class ScrollViewTests (ITestOutputHelper output)
 
         var view = new View
         {
-            ColorScheme = new() { Normal = new (Color.Blue, Color.Yellow) },
+            ColorScheme = new () { Normal = new (Color.Blue, Color.Yellow) },
             Width = Dim.Auto (DimAutoStyle.Text),
             Height = Dim.Auto (DimAutoStyle.Text),
             Text = text
@@ -523,7 +523,9 @@ public class ScrollViewTests (ITestOutputHelper output)
         view.Add (
                   new Label
                   {
-                      Width = Dim.Fill (), Height = 1, Text = rule.Repeat (size.Width / rule.Length)
+                      Width = Dim.Fill (),
+                      Height = 1,
+                      Text = rule.Repeat (size.Width / rule.Length)
                   }
                  );
 
@@ -856,8 +858,8 @@ public class ScrollViewTests (ITestOutputHelper output)
  └──────────────────┘
 ";
 
-        pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 1, 21, 14), pos);
+        TestHelpers.AssertDriverContentsAre (expected, output);
+        
         top.Dispose ();
     }
 
@@ -1090,7 +1092,7 @@ public class ScrollViewTests (ITestOutputHelper output)
             Width = width;
             Height = height;
 
-            labelFill = new() { Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
+            labelFill = new () { Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
 
             labelFill.LayoutComplete += (s, e) =>
                                         {
@@ -1112,7 +1114,7 @@ public class ScrollViewTests (ITestOutputHelper output)
                                             labelFill.Text = fillText.ToString ();
                                         };
 
-            labelText = new() { X = Pos.Center (), Y = Pos.Center (), Text = text };
+            labelText = new () { X = Pos.Center (), Y = Pos.Center (), Text = text };
             Add (labelFill, labelText);
             CanFocus = true;
         }