Fixes gui-cs#2923. Ensures only clear Instances if they really was disposed. (gui-cs#2924)

* Fixes gui-cs#2923. Ensures only clear Instances if they really was disposed and fix unit tests.

* Add Ubuntu-20.04.

* xunit nuget package update.

Author: BDisp

Terminal.Gui/Input/Responder.cs

@@ -15,7 +15,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 
 namespace Terminal.Gui {
@@ -256,7 +256,7 @@ internal static bool IsOverridden (Responder subclass, string method)
 			}
 			return m.GetBaseDefinition ().DeclaringType != m.DeclaringType;
 		}
-		
+
 		/// <summary>
 		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
 		/// </summary>
@@ -266,7 +266,7 @@ internal static bool IsOverridden (Responder subclass, string method)
 		/// can be disposed.
 		/// If disposing equals false, the method has been called by the
 		/// runtime from inside the finalizer and you should not reference
-		/// other objects. Only unmanaged resources can be disposed.		
+		/// other objects. Only unmanaged resources can be disposed.
 		/// </remarks>
 		/// <param name="disposing"></param>
 		protected virtual void Dispose (bool disposing)
@@ -276,13 +276,10 @@ protected virtual void Dispose (bool disposing)
 					// TODO: dispose managed state (managed objects)
 				}
 
-#if DEBUG_IDISPOSABLE
-				Instances.Remove (this);
-#endif                               
 				disposedValue = true;
 			}
 		}
-		
+
 		/// <summary>
 		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resource.
 		/// </summary>
@@ -293,6 +290,10 @@ public void Dispose ()
 			GC.SuppressFinalize (this);
 #if DEBUG_IDISPOSABLE
 			WasDisposed = true;
+
+			foreach (var instance in Instances.Where (x => x.WasDisposed).ToList ()) {
+				Instances.Remove (instance);
+			}
 #endif
 		}
 	}

UnitTests/Application/ApplicationTests.cs

@@ -77,9 +77,7 @@ public void Init_Shutdown_Cleans_Up ()
 			// Validate there are no outstanding Responder-based instances 
 			// after a scenario was selected to run. This proves the main UI Catalog
 			// 'app' closed cleanly.
-			//foreach (var inst in Responder.Instances) {
-				//Assert.True (inst.WasDisposed);
-			//}
+			Assert.Empty (Responder.Instances);
 #endif
 		}
 

UnitTests/Input/ResponderTests.cs

@@ -54,7 +54,9 @@ public void Dispose_Works ()
 #endif
 
 			r.Dispose ();
-
+#if DEBUG_IDISPOSABLE
+			Assert.Empty (Responder.Instances);
+#endif
 		}
 
 		public class DerivedView : View {

UnitTests/TestHelpers.cs

@@ -62,10 +62,13 @@ public override void Before (MethodInfo methodUnderTest)
 	{
 		Debug.WriteLine ($"Before: {methodUnderTest.Name}");
 		if (AutoInit) {
-#if DEBUG_IDISPOSABLE && FORCE_RESPONDER_DISPOSE
+#if DEBUG_IDISPOSABLE
 			// Clear out any lingering Responder instances from previous tests
-			Responder.Instances.Clear ();
-			Assert.Equal (0, Responder.Instances.Count);
+			if (Responder.Instances.Count == 0) {
+				Assert.Empty (Responder.Instances);
+			} else {
+				Responder.Instances.Clear ();
+			}
 #endif
 			Application.Init ((ConsoleDriver)Activator.CreateInstance (_driverType));
 		}
@@ -76,8 +79,12 @@ public override void After (MethodInfo methodUnderTest)
 		Debug.WriteLine ($"After: {methodUnderTest.Name}");
 		if (AutoInit) {
 			Application.Shutdown ();
-#if DEBUG_IDISPOSABLE && FORCE_RESPONDER_DISPOSE
-			Assert.Equal (0, Responder.Instances.Count);
+#if DEBUG_IDISPOSABLE
+			if (Responder.Instances.Count == 0) {
+				Assert.Empty (Responder.Instances);
+			} else {
+				Responder.Instances.Clear ();
+			}
 #endif
 		}
 	}
@@ -104,9 +111,7 @@ public override void After (MethodInfo methodUnderTest)
 	{
 		Debug.WriteLine ($"After: {methodUnderTest.Name}");
 #if DEBUG_IDISPOSABLE
-#pragma warning disable xUnit2013 // Do not use equality check to check for collection size.
-		Assert.Equal (0, Responder.Instances.Count);
-#pragma warning restore xUnit2013 // Do not use equality check to check for collection size.
+		Assert.Empty (Responder.Instances);
 #endif
 	}
 }

UnitTests/UICatalog/ScenarioTests.cs

@@ -105,17 +105,11 @@ public void Run_All_Scenarios ()
 
 				Application.Shutdown ();
 #if DEBUG_IDISPOSABLE
-				foreach (var inst in Responder.Instances) {
-					Assert.True (inst.WasDisposed);
-				}
-				Responder.Instances.Clear ();
+				Assert.Empty (Responder.Instances);
 #endif
 			}
 #if DEBUG_IDISPOSABLE
-			foreach (var inst in Responder.Instances) {
-				Assert.True (inst.WasDisposed);
-			}
-			Responder.Instances.Clear ();
+				Assert.Empty (Responder.Instances);
 #endif
 		}
 
@@ -132,11 +126,24 @@ public void Run_Generic ()
 			// BUGBUG: (#2474) For some reason ReadKey is not returning the QuitKey for some Scenarios
 			// by adding this Space it seems to work.
 
-			FakeConsole.PushMockKeyPress (Key.Space);
 			FakeConsole.PushMockKeyPress (Application.QuitKey);
 
+			var ms = 100;
+			var abortCount = 0;
+			Func<MainLoop, bool> abortCallback = (MainLoop loop) => {
+				abortCount++;
+				output.WriteLine ($"'Generic' abortCount {abortCount}");
+				Application.RequestStop ();
+				return false;
+			};
+
 			int iterations = 0;
+			object token = null;
 			Application.Iteration = () => {
+				if (token == null) {
+					// Timeout only must start at first iteration
+					token = Application.MainLoop.AddTimeout (TimeSpan.FromMilliseconds (ms), abortCallback);
+				}
 				iterations++;
 				output.WriteLine ($"'Generic' iteration {iterations}");
 				// Stop if we run out of control...
@@ -146,16 +153,6 @@ public void Run_Generic ()
 				}
 			};
 
-			var ms = 100;
-			var abortCount = 0;
-			Func<MainLoop, bool> abortCallback = (MainLoop loop) => {
-				abortCount++;
-				output.WriteLine ($"'Generic' abortCount {abortCount}");
-				Application.RequestStop ();
-				return false;
-			};
-			var token = Application.MainLoop.AddTimeout (TimeSpan.FromMilliseconds (ms), abortCallback);
-
 			Application.Top.KeyPress += (object sender, KeyEventEventArgs args) => {
 				// See #2474 for why this is commented out
 				Assert.Equal (Key.CtrlMask | Key.Q, args.KeyEvent.Key);
@@ -175,10 +172,7 @@ public void Run_Generic ()
 			Application.Shutdown ();
 
 #if DEBUG_IDISPOSABLE
-			foreach (var inst in Responder.Instances) {
-				Assert.True (inst.WasDisposed);
-			}
-			Responder.Instances.Clear ();
+			Assert.Empty (Responder.Instances);
 #endif
 		}
 

UnitTests/UnitTests.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="ReportGenerator" Version="5.1.26" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="19.2.69" />
-    <PackageReference Include="xunit" Version="2.5.2" />
+    <PackageReference Include="xunit" Version="2.5.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

UnitTests/Views/OverlappedTests.cs

@@ -32,6 +32,10 @@ public void Dispose_Toplevel_IsOverlappedContainer_False_With_Begin_End ()
 
 			Application.End (rs);
 			Application.Shutdown ();
+
+#if DEBUG_IDISPOSABLE
+			Assert.Empty (Responder.Instances);
+#endif
 		}
 
 		[Fact, TestRespondersDisposed]

testenvironments.json

@@ -10,6 +10,11 @@
 			"type": "wsl",
 			"wslDistribution": "Ubuntu"
 		},
+		{
+			"name": "WSL-Ubuntu-20.04",
+			"type": "wsl",
+			"wslDistribution": "Ubuntu-20.04"
+		},
 		{
 			"name": "WSL-Debian",
 			"type": "wsl",