AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP towards getting unit tests working

This commit is contained in:
Antony Male 2019-07-08 13:20:03 +01:00
parent f4e6e3ecf5
commit f7ec7a255a
9 changed files with 62 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Stylet.Framework/Stylet.Framework.csproj
View File

@ -54,7 +54,7 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Stylet\**\*.cs" Link="%(RecursiveDir)%(FileName)%(Extension)" />
<Compile Include="..\Stylet\**\*.cs" Ignore="..\Stylet\obj\**" Link="%(RecursiveDir)%(FileName)%(Extension)" />
<None Include="..\Stylet\Settings.StyleCop" Link="Settings.StyleCop" />
<None Include="..\Stylet\Stylet.ruleset" Link="Stylet.ruleset" />
@ -67,7 +67,7 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

9
StyletUnitTests/ActionExtensionTests.cs
View File

@ -1,7 +1,10 @@
using Moq;
#if NETFRAMEWORK
using Moq;
using NUnit.Framework;
using Stylet.Xaml;
using System;
using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@ -10,7 +13,7 @@ using System.Xaml;
namespace StyletUnitTests
{
[TestFixture, RequiresSTA]
[TestFixture, Apartment(ApartmentState.STA)]
public class ActionExtensionTests
{
private ActionExtension actionExtension;
@ -125,3 +128,5 @@ namespace StyletUnitTests
}
}
}
#endif

9
StyletUnitTests/BootstrapperBaseTests.cs
View File

@ -1,12 +1,15 @@
using Moq;
#if NETFRAMEWORK
using Moq;
using NUnit.Framework;
using Stylet;
using System;
using System.Threading;
using System.Windows;
namespace StyletUnitTests
{
[TestFixture, RequiresSTA]
[TestFixture, Apartment(ApartmentState.STA)]
public class BootstrapperBaseTests
{
private class RootViewModel : IDisposable
@ -176,3 +179,5 @@ namespace StyletUnitTests
}
}
}
#endif

6
StyletUnitTests/ConductorOneActiveTests.cs
View File

@ -379,7 +379,7 @@ namespace StyletUnitTests
var screen = new Mock<IMyScreen>();
this.conductor.ActivateItem(screen.Object);
screen.ResetCalls();
screen.Invocations.Clear();
int sequence = 0;
screen.Setup(x => x.Deactivate()).Callback(() => Assert.AreEqual(0, sequence++));
@ -400,7 +400,7 @@ namespace StyletUnitTests
var screen2 = new Mock<IMyScreen>();
this.conductor.ActivateItem(screen1.Object);
screen1.ResetCalls();
screen1.Invocations.Clear();
int sequence = 0;
screen1.Setup(x => x.Deactivate()).Callback(() => Assert.AreEqual(0, sequence++));
@ -421,7 +421,7 @@ namespace StyletUnitTests
var screen2 = new Mock<IMyScreen>();
this.conductor.ActivateItem(screen1.Object);
screen1.ResetCalls();
screen1.Invocations.Clear();
int sequence = 0;
screen1.Setup(x => x.Deactivate()).Callback(() => Assert.AreEqual(0, sequence++));

148
StyletUnitTests/StyletUnitTests.csproj
View File

@ -1,135 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{13AFA20D-CCEA-4A58-920E-4D8816C7296B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>StyletUnitTests</RootNamespace>
<AssemblyName>StyletUnitTests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>
</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>
</CodeAnalysisRuleSet>
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
<UseWpf>true</UseWpf>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<PackageReference Include="Moq" Version="4.12.0" />
<PackageReference Include="nunit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="ActionExtensionTests.cs" />
<Compile Include="ApplicationLoaderTests.cs" />
<Compile Include="BindableCollectionTests.cs" />
<Compile Include="BoolToVisibilityConverterTests.cs" />
<Compile Include="BootstrapperBaseTests.cs" />
<Compile Include="BootstrapperTests.cs" />
<Compile Include="CommandActionTests.cs" />
<Compile Include="ConductorAllActiveTests.cs" />
<Compile Include="ConductorNavigatingTests.cs" />
<Compile Include="ConductorOneActiveTests.cs" />
<Compile Include="ConductorTests.cs" />
<Compile Include="DebugConverterTests.cs" />
<Compile Include="StyletIoC\StyletIoCFuncFactoryTests.cs" />
<Compile Include="StyletIoC\StyletIoCInstanceBindingTests.cs" />
<Compile Include="StyletIoC\StyletIoCModuleTests.cs" />
<Compile Include="StyletIoC\StyletIoCMultipleBindingTests.cs" />
<Compile Include="TraceLoggerTests.cs" />
<Compile Include="EqualityConverterTests.cs" />
<Compile Include="EventActionTests.cs" />
<Compile Include="EventAggregatorTests.cs" />
<Compile Include="ExecuteTests.cs" />
<Compile Include="ExpressionExtensionsTests.cs" />
<Compile Include="IconToBitmapSourceConverterTests.cs" />
<Compile Include="LabelledValueTests.cs" />
<Compile Include="StyletLogManagerTests.cs" />
<Compile Include="MessageBoxTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PropertyChangedBaseTests.cs" />
<Compile Include="PropertyChangedExtensionsTests.cs" />
<Compile Include="ScreenExtensionTests.cs" />
<Compile Include="ScreenTests.cs" />
<Compile Include="StyletIoC\StyletIoCAutobindingTests.cs" />
<Compile Include="StyletIoC\StyletIoCBindingChecksTests.cs" />
<Compile Include="StyletIoC\StyletIoCCompileTests.cs" />
<Compile Include="StyletIoC\StyletIoCPropertyInjectionTests.cs" />
<Compile Include="StyletIoC\StyletIoCConstructorInjectionTests.cs" />
<Compile Include="StyletIoC\StyletIoCFactoryTests.cs" />
<Compile Include="StyletIoC\StyletIoCGetAllTests.cs" />
<Compile Include="StyletIoC\StyletIoCGetSingleKeyedTests.cs" />
<Compile Include="StyletIoC\StyletIoCGetSingleTests.cs" />
<Compile Include="StyletIoC\StyletIoCUnboundGenericTests.cs" />
<Compile Include="ValidatingModelBaseTests.cs" />
<Compile Include="ViewManagerTests.cs" />
<Compile Include="ViewTests.cs" />
<Compile Include="WindowManagerTests.cs" />
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<ProjectReference Include="..\Stylet.Framework\Stylet.Framework.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ProjectReference Include="..\Stylet.Core\Stylet.Core.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="StyletUnitTests.ruleset" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

6
StyletUnitTests/ValidatingModelBaseTests.cs
View File

@ -175,7 +175,7 @@ namespace StyletUnitTests
[Test]
public void ValidatePropertyReturnsTrueIfValidationPassed()
{
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(null);
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync((IEnumerable<string>)null);
var result = this.model.ValidateProperty("IntProperty");
Assert.True(result);
@ -224,7 +224,7 @@ namespace StyletUnitTests
[Test]
public void EventRaisedAndHasErrorsChangedIfErrorWasNullAndNowIsNot()
{
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(null);
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync((IEnumerable<string>)null);
this.model.ValidateProperty("IntProperty");
string changedProperty = null;
@ -268,7 +268,7 @@ namespace StyletUnitTests
bool hasErrorsRaised = false;
this.model.PropertyChanged += (o, e) => { if (e.PropertyName == "HasErrors") hasErrorsRaised = true; };
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(null);
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync((IEnumerable<string>)null);
this.model.ValidateProperty("IntProperty");
Assert.AreEqual("IntProperty", changedProperty);

9
StyletUnitTests/ViewManagerTests.cs
View File

@ -1,4 +1,6 @@
using Moq;
#if NETFRAMEWORK
using Moq;
using NUnit.Framework;
using Stylet;
using Stylet.Xaml;
@ -8,6 +10,7 @@ using System.Reflection;
using System.Windows;
using System.Windows.Controls;
using System.Linq;
using System.Threading;
namespace StyletUnitTests
{
@ -19,7 +22,7 @@ namespace StyletUnitTests
{
}
[TestFixture, RequiresSTA]
[TestFixture, Apartment(ApartmentState.STA)]
public class ViewManagerTests
{
private interface I1 { }
@ -404,3 +407,5 @@ namespace StyletUnitTests
}
}
}
#endif

9
StyletUnitTests/ViewTests.cs
View File

@ -1,15 +1,18 @@
using Moq;
#if NETFRAMEWORK
using Moq;
using NUnit.Framework;
using Stylet;
using Stylet.Xaml;
using System;
using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
namespace StyletUnitTests
{
[TestFixture, RequiresSTA]
[TestFixture, Apartment(ApartmentState.STA)]
public class ViewTests
{
private class TestViewModel
@ -157,3 +160,5 @@ namespace StyletUnitTests
}
}
}
#endif

9
StyletUnitTests/WindowManagerTests.cs
View File

@ -1,15 +1,18 @@
using Moq;
#if NETFRAMEWORK
using Moq;
using NUnit.Framework;
using Stylet;
using System;
using System.ComponentModel;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Data;
namespace StyletUnitTests
{
[TestFixture, RequiresSTA]
[TestFixture, Apartment(ApartmentState.STA)]
public class WindowManagerTests
{
public interface IMyScreen : IScreen, IDisposable
@ -401,3 +404,5 @@ namespace StyletUnitTests
}
}
}
#endif