Browse Source

Fix tests

pull/10129/head
Max Katz 3 years ago
parent
commit
546aa8fcae
  1. 1
      tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs
  2. 1
      tests/Avalonia.LeakTests/ControlTests.cs
  3. 3
      tests/Avalonia.UnitTests/MockWindowingPlatform.cs

1
tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs

@ -35,6 +35,7 @@ public abstract class PointerTestsBase
impl.DefaultValue = DefaultValue.Mock; impl.DefaultValue = DefaultValue.Mock;
impl.SetupAllProperties(); impl.SetupAllProperties();
impl.SetupGet(r => r.RenderScaling).Returns(1); impl.SetupGet(r => r.RenderScaling).Returns(1);
impl.Setup(r => r.TryGetFeature(It.IsAny<Type>())).Returns(null);
impl.Setup(r => r.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer); impl.Setup(r => r.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer);
impl.Setup(r => r.PointToScreen(It.IsAny<Point>())).Returns<Point>(p => new PixelPoint((int)p.X, (int)p.Y)); impl.Setup(r => r.PointToScreen(It.IsAny<Point>())).Returns<Point>(p => new PixelPoint((int)p.X, (int)p.Y));
impl.Setup(r => r.PointToClient(It.IsAny<PixelPoint>())).Returns<PixelPoint>(p => new Point(p.X, p.Y)); impl.Setup(r => r.PointToClient(It.IsAny<PixelPoint>())).Returns<PixelPoint>(p => new Point(p.X, p.Y));

1
tests/Avalonia.LeakTests/ControlTests.cs

@ -465,6 +465,7 @@ namespace Avalonia.LeakTests
var renderer = new Mock<IRenderer>(); var renderer = new Mock<IRenderer>();
renderer.Setup(x => x.Dispose()); renderer.Setup(x => x.Dispose());
var impl = new Mock<IWindowImpl>(); var impl = new Mock<IWindowImpl>();
impl.Setup(r => r.TryGetFeature(It.IsAny<Type>())).Returns(null);
impl.SetupGet(x => x.RenderScaling).Returns(1); impl.SetupGet(x => x.RenderScaling).Returns(1);
impl.SetupProperty(x => x.Closed); impl.SetupProperty(x => x.Closed);
impl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object); impl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object);

3
tests/Avalonia.UnitTests/MockWindowingPlatform.cs

@ -35,6 +35,8 @@ namespace Avalonia.UnitTests
windowImpl.Setup(x => x.Screen).Returns(CreateScreenMock().Object); windowImpl.Setup(x => x.Screen).Returns(CreateScreenMock().Object);
windowImpl.Setup(x => x.Position).Returns(() => position); windowImpl.Setup(x => x.Position).Returns(() => position);
windowImpl.Setup(r => r.TryGetFeature(It.IsAny<Type>())).Returns(null);
windowImpl.Setup(x => x.CreatePopup()).Returns(() => windowImpl.Setup(x => x.CreatePopup()).Returns(() =>
{ {
return CreatePopupMock(windowImpl.Object).Object; return CreatePopupMock(windowImpl.Object).Object;
@ -95,6 +97,7 @@ namespace Avalonia.UnitTests
popupImpl.Setup(x => x.RenderScaling).Returns(1); popupImpl.Setup(x => x.RenderScaling).Returns(1);
popupImpl.Setup(x => x.PopupPositioner).Returns(positioner); popupImpl.Setup(x => x.PopupPositioner).Returns(positioner);
popupImpl.Setup(r => r.TryGetFeature(It.IsAny<Type>())).Returns(null);
popupImpl.Setup(x => x.Dispose()).Callback(() => popupImpl.Setup(x => x.Dispose()).Callback(() =>
{ {
popupImpl.Object.Closed?.Invoke(); popupImpl.Object.Closed?.Invoke();

Loading…
Cancel
Save