merge

UICatalog/Scenarios/Clipping.cs

@@ -9,6 +9,7 @@ namespace UICatalog.Scenarios;
 [ScenarioCategory ("Layout")]
 [ScenarioCategory ("Arrangement")]
 [ScenarioCategory ("Tests")]
+[ScenarioCategory ("Drawing")]
 public class Clipping : Scenario
 {
     private int _hotkeyCount;

UnitTests/Application/ApplicationScreenTests.cs

@@ -8,6 +8,7 @@ public class ApplicationScreenTests (ITestOutputHelper output)
     public void ClearScreenNextIteration_Resets_To_False_After_LayoutAndDraw ()
     {
         // Arrange
+        Application.ResetState (true);
         Application.Init ();
 
         // Act
@@ -64,6 +65,8 @@ public class ApplicationScreenTests (ITestOutputHelper output)
         Application.Top.Dispose ();
         Application.Top = null;
         Application.Shutdown ();
+        Application.ResetState (true);
+
     }
 
     [Fact]

UnitTests/Configuration/SettingsScopeTests.cs

@@ -30,6 +30,7 @@ public class SettingsScopeTests
 
         // clean up
         Locations = ConfigLocations.All;
+        Reset ();
     }
 
     [Fact]
@@ -63,7 +64,7 @@ public class SettingsScopeTests
         Assert.Equal (Key.F, Application.NextTabGroupKey);
         Assert.Equal (Key.B, Application.PrevTabGroupKey);
 
-        Locations = ConfigLocations.Default;
+        Locations = ConfigLocations.All;
         Reset ();
 
     }
@@ -109,6 +110,7 @@ public class SettingsScopeTests
         Assert.True (Settings ["Themes"].PropertyValue is Dictionary<string, ThemeScope>);
         Assert.Single ((Dictionary<string, ThemeScope>)Settings ["Themes"].PropertyValue);
 
-        Locations = savedLocations;
+        Locations = ConfigLocations.All;
+        Reset ();
     }
 }