Browse Source

fix leak test.

pull/4531/head
Dan Walmsley 6 years ago
parent
commit
7b8da57257
  1. 20
      tests/Avalonia.LeakTests/ControlTests.cs
  2. 8
      tests/Avalonia.LeakTests/TransitionTests.cs

20
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<ContextMenu>()).ObjectsCount;
initialMenuItemCount = memory.GetObjects(where => where.Type.Is<MenuItem>()).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<ContextMenu>()).ObjectsCount;
initialMenuItemCount = memory.GetObjects(where => where.Type.Is<MenuItem>()).ObjectsCount;
});
AttachShowAndDetachContextMenu(window);
Mock.Get(window.PlatformImpl).ResetCalls();

8
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<TransitionInstance>()).ObjectsCount;
});
Func<Border> 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<TransitionInstance>()).ObjectsCount));
Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TransitionInstance>()).ObjectsCount));
}
}
}

Loading…
Cancel
Save