Fixed Views unit tests

UnitTests/Views/RadioGroupTests.cs

@@ -78,6 +78,7 @@ public class RadioGroupTests (ITestOutputHelper output)
     [Fact]
     public void KeyBindings_Command ()
     {
+        Application.Navigation = new ();
         var rg = new RadioGroup { RadioLabels = new [] { "Test", "New Test" } };
         Application.Current = new Toplevel ();
         Application.Current.Add (rg);
@@ -100,7 +101,7 @@ public class RadioGroupTests (ITestOutputHelper output)
         Assert.Equal (1, rg.SelectedItem);
         Assert.True (Application.OnKeyDown (Key.Space));
         Assert.Equal (1, rg.SelectedItem);
-        Application.Current.Dispose ();
+        Application.ResetState();
     }
 
     [Fact]

UnitTests/Views/ShortcutTests.cs

@@ -211,7 +211,7 @@ public class ShortcutTests
         Assert.Contains (Key.A, shortcut.KeyBindings.Bindings.Keys);
         Assert.DoesNotContain (Key.A, Application.KeyBindings.Bindings.Keys);
     }
-    
+
     [Theory]
     [InlineData (Orientation.Horizontal)]
     [InlineData (Orientation.Vertical)]
@@ -363,7 +363,7 @@ public class ShortcutTests
         shortcut.Accept += (s, e) => accepted++;
 
         Application.OnMouseEvent (
-                                  new()
+                                  new ()
                                   {
                                       Position = new (x, 0),
                                       Flags = MouseFlags.Button1Clicked
@@ -418,7 +418,7 @@ public class ShortcutTests
         //Assert.True (shortcut.HasFocus);
 
         Application.OnMouseEvent (
-                                  new()
+                                  new ()
                                   {
                                       Position = new (x, 0),
                                       Flags = MouseFlags.Button1Clicked
@@ -601,7 +601,8 @@ public class ShortcutTests
     [Fact]
     public void ColorScheme_SetColorScheme_Does_Not_Fault_3664 ()
     {
-        Application.Current = new Toplevel ();
+        Application.Current = new ();
+        Application.Navigation = new ();
         Shortcut shortcut = new Shortcut ();
 
         Application.Current.ColorScheme = null;
@@ -610,9 +611,10 @@ public class ShortcutTests
 
         shortcut.HasFocus = true;
 
-        Assert.NotNull (shortcut.ColorScheme);
+        Assert.Null (shortcut.ColorScheme);
 
         Application.Current.Dispose ();
+        Application.ResetState ();
     }
 
 }

UnitTests/Views/TextFieldTests.cs

@@ -126,7 +126,6 @@ public class TextFieldTests (ITestOutputHelper output)
         Assert.False (fv.CanFocus);
         Assert.False (fv.HasFocus);
 
-        // Assert.Throws<InvalidOperationException> (() => tf.CanFocus = true);
         fv.CanFocus = true;
         tf.CanFocus = true;
 
@@ -147,7 +146,7 @@ public class TextFieldTests (ITestOutputHelper output)
                          );
 
         Assert.Equal ("some ", tf.SelectedText); // Setting CanFocus to false don't change the SelectedText
-        Assert.False (tf.CanFocus);
+        Assert.True (tf.CanFocus); // v2: CanFocus is not longer automatically changed
         Assert.False (tf.HasFocus);
         Assert.False (fv.CanFocus);
         Assert.False (fv.HasFocus);

UnitTests/Views/TextViewTests.cs

@@ -137,7 +137,6 @@ public class TextViewTests
         Assert.False (fv.CanFocus);
         Assert.False (fv.HasFocus);
 
-        Assert.Throws<InvalidOperationException> (() => tv.CanFocus = true);
         fv.CanFocus = true;
         tv.CanFocus = true;
         tv.NewMouseEvent (new MouseEvent { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked });
@@ -152,7 +151,7 @@ public class TextViewTests
         tv.NewMouseEvent (new MouseEvent { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked });
 
         Assert.Equal ("some ", tv.SelectedText); // Setting CanFocus to false don't change the SelectedText
-        Assert.False (tv.CanFocus);
+        Assert.True (tv.CanFocus); // v2: CanFocus is not longer automatically changed
         Assert.False (tv.HasFocus);
         Assert.False (fv.CanFocus);
         Assert.False (fv.HasFocus);