Browse Source

Fix tests.

pull/1317/head
Jeremy Koritzinsky 9 years ago
parent
commit
b0d013ad25
  1. 9
      tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs

9
tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs

@ -15,6 +15,7 @@ using Avalonia.Styling;
using Avalonia.UnitTests; using Avalonia.UnitTests;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Xunit; using Xunit;
using Avalonia.Input;
namespace Avalonia.Controls.UnitTests.Primitives namespace Avalonia.Controls.UnitTests.Primitives
{ {
@ -189,9 +190,11 @@ namespace Avalonia.Controls.UnitTests.Primitives
{ {
using (CreateServices()) using (CreateServices())
{ {
var window = new Window();
var target = new Popup(); var target = new Popup();
var child = new Control(); var child = new Control();
window.Content = target;
target.Open(); target.Open();
Assert.Single(target.PopupRoot.GetVisualChildren()); Assert.Single(target.PopupRoot.GetVisualChildren());
@ -214,7 +217,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
{ {
Content = new Border(), Content = new Border(),
Template = new FuncControlTemplate<PopupContentControl>(PopupContentControlTemplate), Template = new FuncControlTemplate<PopupContentControl>(PopupContentControlTemplate),
} },
StylingParent = AvaloniaLocator.Current.GetService<IGlobalStyles>()
}; };
target.ApplyTemplate(); target.ApplyTemplate();
@ -306,7 +310,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
.Bind<IGlobalStyles>().ToFunc(() => globalStyles.Object) .Bind<IGlobalStyles>().ToFunc(() => globalStyles.Object)
.Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock()) .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
.Bind<IStyler>().ToTransient<Styler>() .Bind<IStyler>().ToTransient<Styler>()
.Bind<IPlatformRenderInterface>().ToFunc(() => renderInterface.Object); .Bind<IPlatformRenderInterface>().ToFunc(() => renderInterface.Object)
.Bind<IInputManager>().ToConstant(new InputManager());
return result; return result;
} }

Loading…
Cancel
Save