|
|
@ -14,7 +14,6 @@ using Perspex.Rendering; |
|
|
using Perspex.Styling; |
|
|
using Perspex.Styling; |
|
|
using Ploeh.AutoFixture; |
|
|
using Ploeh.AutoFixture; |
|
|
using Ploeh.AutoFixture.AutoMoq; |
|
|
using Ploeh.AutoFixture.AutoMoq; |
|
|
using Splat; |
|
|
|
|
|
using Xunit; |
|
|
using Xunit; |
|
|
|
|
|
|
|
|
namespace Perspex.Controls.UnitTests |
|
|
namespace Perspex.Controls.UnitTests |
|
|
@ -24,7 +23,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void ClientSize_Should_Be_Set_On_Construction() |
|
|
public void ClientSize_Should_Be_Set_On_Construction() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -40,7 +39,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Width_Should_Not_Be_Set_On_Construction() |
|
|
public void Width_Should_Not_Be_Set_On_Construction() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -56,7 +55,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Height_Should_Not_Be_Set_On_Construction() |
|
|
public void Height_Should_Not_Be_Set_On_Construction() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -72,7 +71,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Layout_Pass_Should_Not_Be_Automatically_Scheduled() |
|
|
public void Layout_Pass_Should_Not_Be_Automatically_Scheduled() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -88,10 +87,10 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Bounds_Should_Be_Set_After_Layout_Pass() |
|
|
public void Bounds_Should_Be_Set_After_Layout_Pass() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
Locator.CurrentMutable.RegisterConstant(new LayoutManager(), typeof(ILayoutManager)); |
|
|
PerspexLocator.CurrentMutable.Bind<ILayoutManager>().ToConstant(new LayoutManager()); |
|
|
|
|
|
|
|
|
var impl = new Mock<ITopLevelImpl>(); |
|
|
var impl = new Mock<ITopLevelImpl>(); |
|
|
impl.SetupProperty(x => x.ClientSize); |
|
|
impl.SetupProperty(x => x.ClientSize); |
|
|
@ -120,10 +119,10 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Impl_ClientSize_Should_Be_Set_After_Layout_Pass() |
|
|
public void Impl_ClientSize_Should_Be_Set_After_Layout_Pass() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
Locator.CurrentMutable.RegisterConstant(new LayoutManager(), typeof(ILayoutManager)); |
|
|
PerspexLocator.CurrentMutable.Bind<ILayoutManager>().ToConstant(new LayoutManager()); |
|
|
|
|
|
|
|
|
var impl = new Mock<ITopLevelImpl>(); |
|
|
var impl = new Mock<ITopLevelImpl>(); |
|
|
|
|
|
|
|
|
@ -150,7 +149,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Width_And_Height_Should_Not_Be_Set_After_Layout_Pass() |
|
|
public void Width_And_Height_Should_Not_Be_Set_After_Layout_Pass() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -168,11 +167,11 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Render_Should_Be_Scheduled_After_Layout_Pass() |
|
|
public void Render_Should_Be_Scheduled_After_Layout_Pass() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
var completed = new Subject<Unit>(); |
|
|
var completed = new Subject<Unit>(); |
|
|
var layoutManagerMock = Mock.Get(Locator.Current.GetService<ILayoutManager>()); |
|
|
var layoutManagerMock = Mock.Get(PerspexLocator.Current.GetService<ILayoutManager>()); |
|
|
layoutManagerMock.Setup(x => x.LayoutCompleted).Returns(completed); |
|
|
layoutManagerMock.Setup(x => x.LayoutCompleted).Returns(completed); |
|
|
|
|
|
|
|
|
var impl = new Mock<ITopLevelImpl>(); |
|
|
var impl = new Mock<ITopLevelImpl>(); |
|
|
@ -181,7 +180,7 @@ namespace Perspex.Controls.UnitTests |
|
|
var target = new TestTopLevel(impl.Object); |
|
|
var target = new TestTopLevel(impl.Object); |
|
|
completed.OnNext(Unit.Default); |
|
|
completed.OnNext(Unit.Default); |
|
|
|
|
|
|
|
|
var renderManagerMock = Mock.Get(Locator.Current.GetService<IRenderManager>()); |
|
|
var renderManagerMock = Mock.Get(PerspexLocator.Current.GetService<IRenderManager>()); |
|
|
renderManagerMock.Verify(x => x.InvalidateRender(target)); |
|
|
renderManagerMock.Verify(x => x.InvalidateRender(target)); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -189,7 +188,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Width_And_Height_Should_Be_Set_After_Window_Resize_Notification() |
|
|
public void Width_And_Height_Should_Be_Set_After_Window_Resize_Notification() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -209,7 +208,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Activate_Should_Call_Impl_Activate() |
|
|
public void Activate_Should_Call_Impl_Activate() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -225,7 +224,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Impl_Activate_Should_Call_Raise_Activated_Event() |
|
|
public void Impl_Activate_Should_Call_Raise_Activated_Event() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -245,7 +244,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Impl_Close_Should_Call_Raise_Closed_Event() |
|
|
public void Impl_Close_Should_Call_Raise_Closed_Event() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -265,7 +264,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Impl_Deactivate_Should_Call_Raise_Activated_Event() |
|
|
public void Impl_Deactivate_Should_Call_Raise_Activated_Event() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -285,7 +284,7 @@ namespace Perspex.Controls.UnitTests |
|
|
[Fact] |
|
|
[Fact] |
|
|
public void Impl_Input_Should_Pass_Input_To_InputManager() |
|
|
public void Impl_Input_Should_Pass_Input_To_InputManager() |
|
|
{ |
|
|
{ |
|
|
using (Locator.CurrentMutable.WithResolver()) |
|
|
using (PerspexLocator.EnterScope()) |
|
|
{ |
|
|
{ |
|
|
RegisterServices(); |
|
|
RegisterServices(); |
|
|
|
|
|
|
|
|
@ -308,7 +307,7 @@ namespace Perspex.Controls.UnitTests |
|
|
private void RegisterServices() |
|
|
private void RegisterServices() |
|
|
{ |
|
|
{ |
|
|
var fixture = new Fixture().Customize(new AutoMoqCustomization()); |
|
|
var fixture = new Fixture().Customize(new AutoMoqCustomization()); |
|
|
var l = Locator.CurrentMutable; |
|
|
var l = PerspexLocator.CurrentMutable; |
|
|
|
|
|
|
|
|
var formattedText = fixture.Create<IFormattedTextImpl>(); |
|
|
var formattedText = fixture.Create<IFormattedTextImpl>(); |
|
|
var globalStyles = new Mock<IGlobalStyles>(); |
|
|
var globalStyles = new Mock<IGlobalStyles>(); |
|
|
@ -320,14 +319,16 @@ namespace Perspex.Controls.UnitTests |
|
|
|
|
|
|
|
|
globalStyles.Setup(x => x.Styles).Returns(theme); |
|
|
globalStyles.Setup(x => x.Styles).Returns(theme); |
|
|
|
|
|
|
|
|
l.RegisterConstant(new Mock<IInputManager>().Object, typeof(IInputManager)); |
|
|
|
|
|
l.RegisterConstant(new Mock<IFocusManager>().Object, typeof(IFocusManager)); |
|
|
PerspexLocator.CurrentMutable |
|
|
l.RegisterConstant(globalStyles.Object, typeof(IGlobalStyles)); |
|
|
.Bind<IInputManager>().ToConstant(new Mock<IInputManager>().Object) |
|
|
l.RegisterConstant(layoutManager, typeof(ILayoutManager)); |
|
|
.Bind<IFocusManager>().ToConstant(new Mock<IFocusManager>().Object) |
|
|
l.RegisterConstant(new Mock<IPlatformThreadingInterface>().Object, typeof(IPlatformThreadingInterface)); |
|
|
.Bind<IGlobalStyles>().ToConstant(globalStyles.Object) |
|
|
l.RegisterConstant(renderInterface, typeof(IPlatformRenderInterface)); |
|
|
.Bind<ILayoutManager>().ToConstant(layoutManager) |
|
|
l.RegisterConstant(renderManager, typeof(IRenderManager)); |
|
|
.Bind<IPlatformRenderInterface>().ToConstant(renderInterface) |
|
|
l.RegisterConstant(new Styler(), typeof(IStyler)); |
|
|
.Bind<IPlatformThreadingInterface>().ToConstant(new Mock<IPlatformThreadingInterface>().Object) |
|
|
|
|
|
.Bind<IRenderManager>().ToConstant(renderManager) |
|
|
|
|
|
.Bind<IStyler>().ToConstant(new Styler()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private class TestTopLevel : TopLevel |
|
|
private class TestTopLevel : TopLevel |
|
|
|
Nikita Tsukanov
11 years ago