- collect harder

dotnet · Oct 2, 2024 · 9744176 · 9744176
1 parent 587658d
commit 9744176
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/src/Core/tests/UnitTests/WeakListTests.cs b/src/Core/tests/UnitTests/WeakListTests.cs
@@ -11,12 +11,13 @@ public class WeakListTests
 		public async Task ObjectsAreEvicted_GetEnumerator()
 		{
 			var expected = new object();
-			var list = new WeakList<object> { expected, new object() };
+			var evict = new object();
+			WeakReference weakReference = new WeakReference(evict);
+			var list = new WeakList<object> { expected, evict };
+			evict = null;
 			list.CleanupThreshold = 1;
-
-			await Task.Yield();
-			GC.Collect();
-			GC.WaitForPendingFinalizers();
+
+			Assert.False(await weakReference.WaitForCollect(), "Object failed to be collected");
 
 			foreach (var item in list)
 			{
@@ -31,12 +32,13 @@ public async Task ObjectsAreEvicted_GetEnumerator()
 		public async Task ObjectsAreEvicted_Remove()
 		{
 			var expected = new object();
-			var list = new WeakList<object> { expected, new object() };
+			var evict = new object();
+			WeakReference weakReference = new WeakReference(evict);
+			var list = new WeakList<object> { expected, evict };
+			evict = null;
 			list.CleanupThreshold = 1;
 
-			await Task.Yield();
-			GC.Collect();
-			GC.WaitForPendingFinalizers();
+			Assert.False(await weakReference.WaitForCollect(), "Object failed to be collected");
 
 			list.Remove(expected);
 
@@ -47,14 +49,16 @@ public async Task ObjectsAreEvicted_Remove()
 		public async Task ObjectsAreEvicted_Add()
 		{
 			var expected = new object();
-			var list = new WeakList<object> { expected, new object() };
+			var evict = new object();
+			WeakReference weakReference = new WeakReference(evict);
+			var list = new WeakList<object> { expected, evict };
+			evict = null;
 			list.CleanupThreshold = 1;
+
+			Assert.False(await weakReference.WaitForCollect(), "Object failed to be collected");
 
-			await Task.Yield();
-			GC.Collect();
-			GC.WaitForPendingFinalizers();
-
-			list.Add(new object());
+			var triggerCleanup = new object();
+			list.Add(triggerCleanup);
 
 			Assert.Equal(2, list.Count);
 			Assert.Equal(expected, list.First());