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

Push code coverage up to 98.7%, including integration tests

This commit is contained in:
Antony Male 2014-05-09 14:40:40 +01:00
parent a96ec2a6e4
commit 4a527c75d6
12 changed files with 147 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Stylet/Execute.cs
View File

@ -125,14 +125,11 @@ namespace Stylet
{
if (inDesignMode == null)
{
var prop = DesignerProperties.IsInDesignModeProperty;
inDesignMode = (bool)DependencyPropertyDescriptor.FromProperty(prop, typeof(FrameworkElement)).Metadata.DefaultValue;
if (inDesignMode.GetValueOrDefault(false) && Process.GetCurrentProcess().ProcessName.StartsWith("devenv", StringComparison.Ordinal))
inDesignMode = true;
var descriptor = DependencyPropertyDescriptor.FromProperty(DesignerProperties.IsInDesignModeProperty, typeof(FrameworkElement));
inDesignMode = (bool)descriptor.Metadata.DefaultValue;
}
return inDesignMode.GetValueOrDefault(false);
return inDesignMode.Value;
}
}
}

3
Stylet/StyletIoC/StyletIoCContainer.cs
View File

@ -325,9 +325,6 @@ namespace StyletIoC
{
foreach (var unboundGeneric in unboundGenerics)
{
if (unboundGeneric == null)
continue;
// Consider this scenario:
// interface IC<T, U> { } class C<T, U> : IC<U, T> { }
// Then they ask for an IC<int, bool>. We need to give them a C<bool, int>

5
StyletIntegrationTests/Bootstrapper.cs
View File

@ -1,4 +1,5 @@
using Stylet;
using StyletIntegrationTests.BootstrapperIoC;
using System;
using System.Collections.Generic;
using System.Linq;
@ -9,5 +10,9 @@ namespace StyletIntegrationTests
{
public class Bootstrapper : Bootstrapper<ShellViewModel>
{
protected override void ConfigureIoC(StyletIoC.IStyletIoCBuilder builder)
{
builder.Bind<BootstrapperIoCI1>().ToAllImplementations();
}
}
}

12
StyletIntegrationTests/BootstrapperIoC/WindowView.xaml Normal file
View File

@ -0,0 +1,12 @@
<Window x:Class="StyletIntegrationTests.BootstrapperIoC.WindowView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="https://github.com/canton7/Stylet"
Title="DialogView" Width="300" SizeToContent="Height">
<DockPanel Margin="20" LastChildFill="False">
<TextBlock DockPanel.Dock="Top" TextWrapping="WrapWithOverflow">Make sure that pressing the following buttons has no visible effect (no dialogs, crashes, etc).</TextBlock>
<Button DockPanel.Dock="Top" Command="{s:Action GetSingle}" Margin="0,10,0,0">GetSingle</Button>
<Button DockPanel.Dock="Top" Command="{s:Action GetAll}" Margin="0,10,0,0">GetAll</Button>
<Button DockPanel.Dock="Top" Command="{s:Action BuildUp}" Margin="0,10,0,0">BuildUp</Button>
</DockPanel>
</Window>

27
StyletIntegrationTests/BootstrapperIoC/WindowView.xaml.cs Normal file
View File

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace StyletIntegrationTests.BootstrapperIoC
{
/// <summary>
/// Interaction logic for WindowView.xaml
/// </summary>
public partial class WindowView : Window
{
public WindowView()
{
InitializeComponent();
}
}
}

44
StyletIntegrationTests/BootstrapperIoC/WindowViewModel.cs Normal file
View File

@ -0,0 +1,44 @@
using Stylet;
using StyletIoC;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StyletIntegrationTests.BootstrapperIoC
{
interface BootstrapperIoCI1 { }
class BootstrapperIoCC1 : BootstrapperIoCI1 { }
class BootstrapperIoCC2 : BootstrapperIoCI1 { }
class BootstrapperIoCC3
{
[Inject]
public BootstrapperIoCC1 C1 { get; set; }
}
public class WindowViewModel : Screen
{
public void GetSingle()
{
var result = IoC.Get<BootstrapperIoCC1>();
if (result == null)
throw new Exception("IoC.Get failed");
}
public void GetAll()
{
var result = IoC.GetAll<BootstrapperIoCI1>().ToList();
if (result.Count != 2 || !(result[0] is BootstrapperIoCC1) || !(result[1] is BootstrapperIoCC2))
throw new Exception("IoC.GetAll failed");
}
public void BuildUp()
{
var c3 = new BootstrapperIoCC3();
IoC.BuildUp(c3);
if (c3.C1 == null)
throw new Exception("IoC.BuildUp failed");
}
}
}

6
StyletIntegrationTests/ShellView.xaml
View File

@ -23,7 +23,11 @@
<GroupBox DockPanel.Dock="Top" Header="Window Lifecycle" Padding="10">
<Button Command="{s:Action ShowWindowLifecycle}">Show Window</Button>
</GroupBox>
<GroupBox DockPanel.Dock="Top" Header="Bootstrapper IoC" Padding="10">
<Button Command="{s:Action ShowBootstrapperIoC}">Show Window</Button>
</GroupBox>
<GroupBox DockPanel.Dock="Top" Header="Actions" Padding="10">
<Button Command="{s:Action ShowActions}">Show Window</Button>
</GroupBox>

6
StyletIntegrationTests/ShellViewModel.cs
View File

@ -50,6 +50,12 @@ namespace StyletIntegrationTests
this.windowManager.ShowWindow(window);
}
public void ShowBootstrapperIoC()
{
var window = new BootstrapperIoC.WindowViewModel();
this.windowManager.ShowWindow(window);
}
public void ShowActions()
{
var window = new Actions.ActionsViewModel();

8
StyletIntegrationTests/StyletIntegrationTests.csproj
View File

@ -57,6 +57,10 @@
<ItemGroup>
<Compile Include="Actions\ActionsViewModel.cs" />
<Compile Include="Bootstrapper.cs" />
<Compile Include="BootstrapperIoC\WindowView.xaml.cs">
<DependentUpon>WindowView.xaml</DependentUpon>
</Compile>
<Compile Include="BootstrapperIoC\WindowViewModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
@ -99,6 +103,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="BootstrapperIoC\WindowView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ShellView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

6
StyletUnitTests/ExecuteTests.cs
View File

@ -184,5 +184,11 @@ namespace StyletUnitTests
Execute.OnUIThreadAsync(() => called = true);
Assert.True(called);
}
[Test]
public void InDesignModeReturnsFalse()
{
Assert.False(Execute.InDesignMode);
}
}
}

22
StyletUnitTests/StyletIoC/StyletIoCConstructorInjectionTests.cs
View File

@ -2,6 +2,7 @@
using StyletIoC;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -100,6 +101,13 @@ namespace StyletUnitTests
}
}
class C10
{
public C10(ObservableCollection<C10> c1s)
{
}
}
[TestFixture]
public class StyletIoCConstructorInjectionTests
{
@ -243,5 +251,19 @@ namespace StyletUnitTests
Assert.Throws<StyletIoCRegistrationException>(() => ioc.Get<C9>());
}
[Test]
public void ThrowsIfCollectionTypeCantBeResolved()
{
// This test is needed to hit a condition in TryRetrieveGetAllRegistrationFromElementType
// where a collection type is constructed, but is unsuitable
var builder = new StyletIoCBuilder();
builder.Bind<C1>().ToSelf();
builder.Bind<C10>().ToSelf();
var ioc = builder.BuildContainer();
Assert.Throws<StyletIoCFindConstructorException>(() => ioc.Get<C10>());
}
}
}

9
StyletUnitTests/StyletIoC/StyletIoCUnboundGenericTests.cs
View File

@ -68,5 +68,14 @@ namespace StyletUnitTests
Assert.NotNull(ioc.Get<I1<int>>("test"));
}
[Test]
public void ThrowsIfMultipleRegistrationsForUnboundGeneric()
{
var builder = new StyletIoCBuilder();
builder.Bind(typeof(C1<>)).ToSelf();
builder.Bind(typeof(C1<>)).ToSelf();
Assert.Throws<StyletIoCRegistrationException>(() => builder.BuildContainer());
}
}
}