Browse Source

Removed AutoMoq from Perspex.UnitTests.

It was causing problems with binding redirects to Moq and it's not much
harder to do it by hand.
pull/472/head
Steven Kirk 10 years ago
parent
commit
9e10cec9f5
  1. 8
      tests/Perspex.UnitTests/Perspex.UnitTests.csproj
  2. 22
      tests/Perspex.UnitTests/TestServices.cs
  3. 4
      tests/Perspex.UnitTests/packages.config

8
tests/Perspex.UnitTests/Perspex.UnitTests.csproj

@ -36,14 +36,6 @@
<HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ploeh.AutoFixture, Version=3.40.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\..\packages\AutoFixture.3.40.0\lib\net40\Ploeh.AutoFixture.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ploeh.AutoFixture.AutoMoq, Version=3.40.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\..\packages\AutoFixture.AutoMoq.3.40.0\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

22
tests/Perspex.UnitTests/TestServices.cs

@ -2,29 +2,25 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
using System.Reflection;
using Moq;
using Perspex.Input;
using Perspex.Layout;
using Perspex.Markup.Xaml;
using Perspex.Media;
using Perspex.Platform;
using Perspex.Shared.PlatformSupport;
using Perspex.Styling;
using Perspex.Themes.Default;
using Ploeh.AutoFixture;
using Ploeh.AutoFixture.AutoMoq;
namespace Perspex.UnitTests
{
public class TestServices
{
private static IFixture s_fixture = new Fixture().Customize(new AutoMoqCustomization());
public static readonly TestServices StyledWindow = new TestServices(
assetLoader: new AssetLoader(),
layoutManager: new LayoutManager(),
platformWrapper: new PclPlatformWrapper(),
renderInterface: s_fixture.Create<IPlatformRenderInterface>(),
renderInterface: CreateRenderInterfaceMock(),
standardCursorFactory: Mock.Of<IStandardCursorFactory>(),
styler: new Styler(),
theme: () => CreateDefaultTheme(),
@ -122,5 +118,19 @@ namespace Perspex.UnitTests
return result;
}
private static IPlatformRenderInterface CreateRenderInterfaceMock()
{
return Mock.Of<IPlatformRenderInterface>(x =>
x.CreateFormattedText(
It.IsAny<string>(),
It.IsAny<string>(),
It.IsAny<double>(),
It.IsAny<FontStyle>(),
It.IsAny<TextAlignment>(),
It.IsAny<FontWeight>()) == Mock.Of<IFormattedTextImpl>() &&
x.CreateStreamGeometry() == Mock.Of<IStreamGeometryImpl>(
y => y.Open() == Mock.Of<IStreamGeometryContextImpl>()));
}
}
}

4
tests/Perspex.UnitTests/packages.config

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoFixture" version="3.40.0" targetFramework="net46" />
<package id="AutoFixture.AutoMoq" version="3.40.0" targetFramework="net46" />
<package id="Moq" version="4.2.1510.2205" targetFramework="net46" />
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />

Loading…
Cancel
Save