Unit test cleanup

Author: tig

Terminal.Gui/View/View.Drawing.cs

@@ -366,12 +366,15 @@ private void DoDrawText ()
     /// <returns><see langword="true"/> to stop further drawing of  <see cref="Text"/>.</returns>
     protected virtual bool OnDrawingText () { return false; }
 
+
+#pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
     /// <summary>Raised when the <see cref="Text"/> of the View is to be drawn.</summary>
     /// <returns>
     ///     Set <see cref="DrawEventArgs.Cancel"/> to <see langword="true"/> to stop further drawing of
     ///     <see cref="Text"/>.
     /// </returns>
     public event EventHandler<DrawEventArgs>? DrawingText;
+#pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 
     /// <summary>
     ///     Draws the <see cref="Text"/> of the View using the <see cref="TextFormatter"/>.
@@ -468,6 +471,8 @@ private void DoDrawSubviews ()
     /// <returns><see langword="true"/> to stop further drawing of <see cref="Subviews"/>.</returns>
     protected virtual bool OnDrawingSubviews () { return false; }
 
+
+#pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
     /// <summary>Raised when the <see cref="Subviews"/> are to be drawn.</summary>
     /// <remarks>
     /// </remarks>
@@ -476,6 +481,7 @@ private void DoDrawSubviews ()
     ///     <see cref="Subviews"/>.
     /// </returns>
     public event EventHandler<DrawEventArgs>? DrawingSubviews;
+#pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
 
     /// <summary>
     ///     Draws the <see cref="Subviews"/>.

Terminal.Gui/View/View.Layout.cs

@@ -501,7 +501,7 @@ public bool SetRelativeLayout (Size superviewContentSize)
                 newH = _height.Calculate (newY, superviewContentSize.Height, this, Dimension.Height);
             }
         }
-        catch (LayoutException le)
+        catch (LayoutException)
         {
             //Debug.WriteLine ($"A Dim/PosFunc function threw (typically this is because a dependent View was not laid out)\n{le}.");
             return false;

UICatalog/Scenarios/AllViewsTester.cs

@@ -194,7 +194,7 @@ public override void Main ()
             // X = Pos.Right(_layoutEditor),
             SuperViewRendersLineCanvas = true
         };
-        _eventLog.Border.Thickness = new (1);
+        _eventLog.Border!.Thickness = new (1);
         _eventLog.X = Pos.AnchorEnd () - 1;
         _eventLog.Y = 0;
 

UnitTests/View/Draw/DrawTests.cs

@@ -18,7 +18,7 @@ public void Move_Is_Constrained_To_Viewport ()
             Y = 1,
             Width = 3, Height = 3
         };
-        view.Margin.Thickness = new (1);
+        view.Margin!.Thickness = new (1);
 
         // Only valid location w/in Viewport is 0, 0 (view) - 2, 2 (screen)
 
@@ -42,7 +42,7 @@ public void AddRune_Is_Constrained_To_Viewport ()
             Y = 1,
             Width = 3, Height = 3
         };
-        view.Padding.Thickness = new (1);
+        view.Padding!.Thickness = new (1);
         view.Padding.Diagnostics = ViewDiagnosticFlags.Thickness;
         view.BeginInit ();
         view.EndInit ();
@@ -315,7 +315,7 @@ public void Clipping_Wide_Runes ()
                    これは広いルーンラインです。
                    """,
         };
-        frameView.Border.LineStyle = LineStyle.Single;
+        frameView.Border!.LineStyle = LineStyle.Single;
         frameView.Border.Thickness = new (1, 0, 0, 0);
 
         top.Add (frameView);
@@ -338,7 +338,7 @@ public void Clipping_Wide_Runes ()
             Width = Dim.Auto (),
             BorderStyle = LineStyle.Single
         };
-        view.Border.Thickness = new (1, 0, 1, 0);
+        view.Border!.Thickness = new (1, 0, 1, 0);
 
         top.Add (view);
         top.Layout ();
@@ -451,7 +451,7 @@ public void Draw_Minimum_Full_Border_With_Empty_Viewport ()
     public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Bottom ()
     {
         var view = new View { Width = 2, Height = 1, BorderStyle = LineStyle.Single };
-        view.Border.Thickness = new (1, 1, 1, 0);
+        view.Border!.Thickness = new (1, 1, 1, 0);
         view.BeginInit ();
         view.EndInit ();
         view.SetRelativeLayout (Application.Screen.Size);
@@ -469,7 +469,7 @@ public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Bottom ()
     public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Left ()
     {
         var view = new View { Width = 1, Height = 2, BorderStyle = LineStyle.Single };
-        view.Border.Thickness = new (0, 1, 1, 1);
+        view.Border!.Thickness = new (0, 1, 1, 1);
         view.BeginInit ();
         view.EndInit ();
         view.SetRelativeLayout (Application.Screen.Size);
@@ -494,7 +494,7 @@ public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Left ()
     public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Right ()
     {
         var view = new View { Width = 1, Height = 2, BorderStyle = LineStyle.Single };
-        view.Border.Thickness = new (1, 1, 0, 1);
+        view.Border!.Thickness = new (1, 1, 0, 1);
         view.BeginInit ();
         view.EndInit ();
         view.SetRelativeLayout (Application.Screen.Size);
@@ -519,7 +519,7 @@ public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Right ()
     public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Top ()
     {
         var view = new View { Width = 2, Height = 1, BorderStyle = LineStyle.Single };
-        view.Border.Thickness = new (1, 0, 1, 1);
+        view.Border!.Thickness = new (1, 0, 1, 1);
 
         view.BeginInit ();
         view.EndInit ();
@@ -964,7 +964,7 @@ public void SetClip_ClipVisibleContentOnly_VisibleContentIsClipped ()
             ViewportSettings = ViewportSettings.ClipContentOnly
         };
         view.SetContentSize (new Size (10, 10));
-        view.Border.Thickness = new (1);
+        view.Border!.Thickness = new (1);
         view.BeginInit ();
         view.EndInit ();
         Assert.Equal (view.Frame, View.GetClip ()!.GetBounds ());
@@ -997,7 +997,7 @@ public void SetClip_Default_ClipsToViewport ()
             Height = Dim.Fill ()
         };
         view.SetContentSize (new Size (10, 10));
-        view.Border.Thickness = new (1);
+        view.Border!.Thickness = new (1);
         view.BeginInit ();
         view.EndInit ();
         Assert.Equal (view.Frame, View.GetClip ()!.GetBounds ());