diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs index 73fbc02042..3e50be2db7 100644 --- a/tests/Avalonia.LeakTests/ControlTests.cs +++ b/tests/Avalonia.LeakTests/ControlTests.cs @@ -426,16 +426,7 @@ namespace Avalonia.LeakTests public void Attached_ContextMenu_Is_Freed() { using (Start()) - { - // Context menu in resources means the baseline may not be 0. - var initialMenuCount = 0; - var initialMenuItemCount = 0; - dotMemory.Check(memory => - { - initialMenuCount = memory.GetObjects(where => where.Type.Is()).ObjectsCount; - initialMenuItemCount = memory.GetObjects(where => where.Type.Is()).ObjectsCount; - }); - + { void AttachShowAndDetachContextMenu(Control control) { var contextMenu = new ContextMenu @@ -458,6 +449,15 @@ namespace Avalonia.LeakTests Assert.Same(window, FocusManager.Instance.Current); + // Context menu in resources means the baseline may not be 0. + var initialMenuCount = 0; + var initialMenuItemCount = 0; + dotMemory.Check(memory => + { + initialMenuCount = memory.GetObjects(where => where.Type.Is()).ObjectsCount; + initialMenuItemCount = memory.GetObjects(where => where.Type.Is()).ObjectsCount; + }); + AttachShowAndDetachContextMenu(window); Mock.Get(window.PlatformImpl).ResetCalls(); diff --git a/tests/Avalonia.LeakTests/TransitionTests.cs b/tests/Avalonia.LeakTests/TransitionTests.cs index 81c1e28b7d..c7add1fe11 100644 --- a/tests/Avalonia.LeakTests/TransitionTests.cs +++ b/tests/Avalonia.LeakTests/TransitionTests.cs @@ -23,12 +23,6 @@ namespace Avalonia.LeakTests using (UnitTestApplication.Start(new TestServices(globalClock: clock))) { - var initialCount = 0; - dotMemory.Check(memory => - { - initialCount = memory.GetObjects(where => where.Type.Is()).ObjectsCount; - }); - Func run = () => { var border = new Border @@ -59,7 +53,7 @@ namespace Avalonia.LeakTests var result = run(); dotMemory.Check(memory => - Assert.Equal(initialCount, memory.GetObjects(where => where.Type.Is()).ObjectsCount)); + Assert.Equal(0, memory.GetObjects(where => where.Type.Is()).ObjectsCount)); } } }