Fixes #4374 - Nukes all (?) legacy Driver and Application stuff; revamps tests (#4376)

Tests/UnitTests/Application/ApplicationPopoverTests.cs

@@ -6,199 +6,250 @@ public class ApplicationPopoverTests
     [Fact]
     public void Application_Init_Initializes_PopoverManager ()
     {
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
 
-        // Act
-        Assert.NotNull (Application.Popover);
-
-        Application.ResetState (true);
+            // Act
+            Assert.NotNull (Application.Popover);
+        }
+        finally
+        {
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
     public void Application_Shutdown_Resets_PopoverManager ()
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
 
-        // Act
-        Assert.NotNull (Application.Popover);
+            // Act
+            Assert.NotNull (Application.Popover);
 
-        Application.Shutdown ();
+            Application.Shutdown ();
 
-        // Test
-        Assert.Null (Application.Popover);
+            // Test
+            Assert.Null (Application.Popover);
+        }
+        finally
+        {
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
     public void Application_End_Does_Not_Reset_PopoverManager ()
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
-        Assert.NotNull (Application.Popover);
-        Application.Iteration += (s, a) => Application.RequestStop ();
+        Toplevel? top = null;
 
-        var top = new Toplevel ();
-        RunState rs = Application.Begin (top);
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
+            Assert.NotNull (Application.Popover);
+            Application.StopAfterFirstIteration = true;
 
-        // Act
-        Application.End (rs);
+            top = new Toplevel ();
+            SessionToken rs = Application.Begin (top);
 
-        // Test
-        Assert.NotNull (Application.Popover);
+            // Act
+            Application.End (rs);
 
-        top.Dispose ();
-        Application.Shutdown ();
+            // Test
+            Assert.NotNull (Application.Popover);
+        }
+        finally
+        {
+            top?.Dispose ();
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
     public void Application_End_Hides_Active ()
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
-        Application.Iteration += (s, a) => Application.RequestStop ();
+        Toplevel? top = null;
 
-        var top = new Toplevel ();
-        RunState rs = Application.Begin (top);
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
+            Application.StopAfterFirstIteration = true;
 
-        PopoverTestClass popover = new ();
+            top = new Toplevel ();
+            SessionToken rs = Application.Begin (top);
 
-        Application.Popover?.Show (popover);
-        Assert.True (popover.Visible);
+            PopoverTestClass? popover = new ();
 
-        // Act
-        Application.End (rs);
-        top.Dispose ();
+            Application.Popover?.Show (popover);
+            Assert.True (popover.Visible);
 
-        // Test
-        Assert.False (popover.Visible);
-        Assert.NotNull (Application.Popover);
+            // Act
+            Application.End (rs);
 
-        Application.Shutdown ();
-        Assert.Equal (1, popover.DisposedCount);
+            // Test
+            Assert.False (popover.Visible);
+            Assert.NotNull (Application.Popover);
+
+            popover.Dispose ();
+            Assert.Equal (1, popover.DisposedCount);
+        }
+        finally
+        {
+            top?.Dispose ();
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
     public void Application_Shutdown_Disposes_Registered_Popovers ()
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
 
-        PopoverTestClass popover = new ();
+            PopoverTestClass? popover = new ();
 
-        // Act
-        Application.Popover?.Register (popover);
-        Application.Shutdown ();
+            // Act
+            Application.Popover?.Register (popover);
+            Application.Shutdown ();
 
-        // Test
-        Assert.Equal (1, popover.DisposedCount);
+            // Test
+            Assert.Equal (1, popover.DisposedCount);
+        }
+        finally
+        {
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
     public void Application_Shutdown_Does_Not_Dispose_DeRegistered_Popovers ()
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
 
-        PopoverTestClass popover = new ();
+            PopoverTestClass? popover = new ();
 
-        Application.Popover?.Register (popover);
+            Application.Popover?.Register (popover);
 
-        // Act
-        Application.Popover?.DeRegister (popover);
-        Application.Shutdown ();
+            // Act
+            Application.Popover?.DeRegister (popover);
+            Application.Shutdown ();
 
-        // Test
-        Assert.Equal (0, popover.DisposedCount);
+            // Test
+            Assert.Equal (0, popover.DisposedCount);
 
-        popover.Dispose ();
-        Assert.Equal (1, popover.DisposedCount);
+            popover.Dispose ();
+            Assert.Equal (1, popover.DisposedCount);
+        }
+        finally
+        {
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
     public void Application_Shutdown_Does_Not_Dispose_ActiveNotRegistered_Popover ()
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
 
-        PopoverTestClass popover = new ();
+            PopoverTestClass? popover = new ();
 
-        Application.Popover?.Show (popover);
-        Application.Popover?.DeRegister (popover);
+            Application.Popover?.Show (popover);
+            Application.Popover?.DeRegister (popover);
 
-        // Act
-        Application.Shutdown ();
+            // Act
+            Application.Shutdown ();
 
-        // Test
-        Assert.Equal (0, popover.DisposedCount);
+            // Test
+            Assert.Equal (0, popover.DisposedCount);
 
-        popover.Dispose ();
-        Assert.Equal (1, popover.DisposedCount);
+            popover.Dispose ();
+            Assert.Equal (1, popover.DisposedCount);
+        }
+        finally
+        {
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
     public void Register_SetsTopLevel ()
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
-        Application.Top = new Toplevel ();
-        PopoverTestClass popover = new ();
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
+            Application.Top = new Toplevel ();
+            PopoverTestClass? popover = new ();
 
-        // Act
-        Application.Popover?.Register (popover);
+            // Act
+            Application.Popover?.Register (popover);
 
-        // Assert
-        Assert.Equal (Application.Top, popover.Toplevel);
-
-        Application.ResetState (true);
+            // Assert
+            Assert.Equal (Application.Top, popover.Toplevel);
+        }
+        finally
+        {
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
     public void Keyboard_Events_Go_Only_To_Popover_Associated_With_Toplevel ()
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
-        Application.Top = new Toplevel () { Id = "initialTop" };
-        PopoverTestClass popover = new ();
-        int keyDownEvents = 0;
-        popover.KeyDown += (s, e) =>
-                           {
-                               keyDownEvents++;
-                               e.Handled = true;
-                           }; // Ensure it handles the key
+        try
+        {
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
+            Application.Top = new Toplevel () { Id = "initialTop" };
+            PopoverTestClass? popover = new ();
+            int keyDownEvents = 0;
+            popover.KeyDown += (s, e) =>
+            {
+                keyDownEvents++;
+                e.Handled = true;
+            }; // Ensure it handles the key
 
-        Application.Popover?.Register (popover);
+            Application.Popover?.Register (popover);
 
-        // Act
-        Application.RaiseKeyDownEvent (Key.A); // Goes to initialTop
+            // Act
+            Application.RaiseKeyDownEvent (Key.A); // Goes to initialTop
 
-        Application.Top = new Toplevel () { Id = "secondaryTop" };
-        Application.RaiseKeyDownEvent (Key.A); // Goes to secondaryTop
+            Application.Top = new Toplevel () { Id = "secondaryTop" };
+            Application.RaiseKeyDownEvent (Key.A); // Goes to secondaryTop
 
-        // Test
-        Assert.Equal (1, keyDownEvents);
+            // Test
+            Assert.Equal (1, keyDownEvents);
 
-
-        popover.Dispose ();
-        Assert.Equal (1, popover.DisposedCount);
-        Application.ResetState (true);
+            popover.Dispose ();
+            Assert.Equal (1, popover.DisposedCount);
+        }
+        finally
+        {
+            Application.ResetState (true);
+        }
     }
 
     // See: https://github.com/gui-cs/Terminal.Gui/issues/4122
@@ -212,58 +263,64 @@ public class ApplicationPopoverTests
     [InlineData (3, 3, new [] { "top" })]
     public void GetViewsUnderMouse_Supports_ActivePopover (int mouseX, int mouseY, string [] viewIdStrings)
     {
-        Application.ResetState (true);
-        // Arrange
-        Assert.Null (Application.Popover);
-        Application.Init (new FakeDriver ());
-        Application.Top = new ()
+        PopoverTestClass? popover = null;
+
+        try
         {
-            Frame = new (0, 0, 10, 10),
-            Id = "top"
-        };
+            // Arrange
+            Assert.Null (Application.Popover);
+            Application.Init (null, "fake");
+            Application.Top = new ()
+            {
+                Frame = new (0, 0, 10, 10),
+                Id = "top"
+            };
 
-        View view = new ()
+            View? view = new ()
+            {
+                Id = "view",
+                X = 1,
+                Y = 1,
+                Width = 2,
+                Height = 2,
+            };
+
+            Application.Top.Add (view);
+
+            popover = new ()
+            {
+                Id = "popover",
+                X = 5,
+                Y = 5,
+                Width = 3,
+                Height = 3,
+            }; // at 5,5 to 8,8 (screen)
+
+            View? popoverSubView = new ()
+            {
+                Id = "popoverSubView",
+                X = 1,
+                Y = 1,
+                Width = 1,
+                Height = 1,
+            };
+
+            popover.Add (popoverSubView);
+
+            Application.Popover?.Show (popover);
+
+            List<View?> found = View.GetViewsUnderLocation (new (mouseX, mouseY), ViewportSettingsFlags.TransparentMouse);
+
+            string [] foundIds = found.Select (v => v!.Id).ToArray ();
+
+            Assert.Equal (viewIdStrings, foundIds);
+        }
+        finally
         {
-            Id = "view",
-            X = 1,
-            Y = 1,
-            Width = 2,
-            Height = 2,
-        }; // at 1,1 to 3,2 (screen)
-
-        Application.Top.Add (view);
-
-        PopoverTestClass popover = new ()
-        {
-            Id = "popover",
-            X = 5,
-            Y = 5,
-            Width = 3,
-            Height = 3,
-        }; // at 5,5 to 8,8 (screen)
-
-        View popoverSubView = new ()
-        {
-            Id = "popoverSubView",
-            X = 1,
-            Y = 1,
-            Width = 1,
-            Height = 1,
-        }; // at 6,6 to 7,7 (screen)
-
-        popover.Add (popoverSubView);
-
-        Application.Popover?.Show (popover);
-
-        List<View?> found = View.GetViewsUnderLocation (new (mouseX, mouseY), ViewportSettingsFlags.TransparentMouse);
-
-        string [] foundIds = found.Select (v => v!.Id).ToArray ();
-
-        Assert.Equal (viewIdStrings, foundIds);
-
-        popover.Dispose ();
-        Application.Top.Dispose ();
-        Application.ResetState (true);
+            popover?.Dispose ();
+            Application.Top?.Dispose ();
+            Application.ResetState (true);
+        }
     }
 
     public class PopoverTestClass : PopoverBaseImpl
@@ -304,4 +361,4 @@ public class ApplicationPopoverTests
             DisposedCount++;
         }
     }
-}
+}