Skip to content

Commit

Permalink
housekeeping: move to fluent assertions
Browse files Browse the repository at this point in the history 
Fix android and uwp runners
  • Loading branch information
@glennawatson
glennawatson committed Oct 13, 2020
1 parent 980f041 commit 6474e1d
Show file tree
Hide file tree
Showing 12 changed files with 148 additions and 133 deletions.
4 changes: 2 additions & 2 deletions src/Directory.build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="Xunit.StaFact" Version="1.0.37" />
<PackageReference Include="Shouldly" Version="4.0.0-beta0003" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.4.1" />
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
<PackageReference Include="DiffEngine" Version="6.1.1" />
</ItemGroup>

<ItemGroup Condition="$(IsTestProject) and !$(TargetFramework.StartsWith('netstandard'))">
<ItemGroup Condition="$(IsTestProject) and !$(TargetFramework.StartsWith('netstandard')) and !$(TargetFramework.StartsWith('MonoAndroid')) and !$(TargetFramework.StartsWith('uap'))">
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
Expand Down
26 changes: 14 additions & 12 deletions src/Splat.Autofac.Tests/DependencyResolverTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

using System;
using Autofac;
using Shouldly;

using FluentAssertions;

using Splat.Common.Test;
using Splat.Tests.ServiceLocation;
using Xunit;
Expand Down Expand Up @@ -33,10 +35,10 @@ public void AutofacDependencyResolver_Should_Resolve_Views()
var viewOne = Locator.Current.GetService(typeof(IViewFor<ViewModelOne>));
var viewTwo = Locator.Current.GetService(typeof(IViewFor<ViewModelTwo>));

viewOne.ShouldNotBeNull();
viewOne.ShouldBeOfType<ViewOne>();
viewTwo.ShouldNotBeNull();
viewTwo.ShouldBeOfType<ViewTwo>();
viewOne.Should().NotBeNull();
viewOne.Should().BeOfType<ViewOne>();
viewTwo.Should().NotBeNull();
viewTwo.Should().BeOfType<ViewTwo>();
}

/// <summary>
Expand All @@ -53,8 +55,8 @@ public void AutofacDependencyResolver_Should_Resolve_Named_View()

var viewTwo = Locator.Current.GetService(typeof(IViewFor<ViewModelTwo>), "Other");

viewTwo.ShouldNotBeNull();
viewTwo.ShouldBeOfType<ViewTwo>();
viewTwo.Should().NotBeNull();
viewTwo.Should().BeOfType<ViewTwo>();
}

/// <summary>
Expand All @@ -73,8 +75,8 @@ public void AutofacDependencyResolver_Should_Resolve_View_Models()
var vmOne = Locator.Current.GetService<ViewModelOne>();
var vmTwo = Locator.Current.GetService<ViewModelTwo>();

vmOne.ShouldNotBeNull();
vmTwo.ShouldNotBeNull();
vmOne.Should().NotBeNull();
vmTwo.Should().NotBeNull();
}

/// <summary>
Expand All @@ -91,8 +93,8 @@ public void AutofacDependencyResolver_Should_Resolve_Screen()

var screen = Locator.Current.GetService<IScreen>();

screen.ShouldNotBeNull();
screen.ShouldBeOfType<MockScreen>();
screen.Should().NotBeNull();
screen.Should().BeOfType<MockScreen>();
}

/// <summary>
Expand All @@ -109,7 +111,7 @@ public void AutofacDependencyResolver_Should_Throw_If_ServiceRegistrationCallbac
var result = Record.Exception(() =>
Locator.CurrentMutable.ServiceRegistrationCallback(typeof(IScreen), disposable => { }));

result.ShouldBeOfType<NotImplementedException>();
result.Should().BeOfType<NotImplementedException>();
}

/// <summary>
Expand Down
42 changes: 22 additions & 20 deletions src/Splat.DryIoc.Tests/DependencyResolverTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
using System.Collections.Generic;
using System.Linq;
using DryIoc;
using Shouldly;

using FluentAssertions;

using Splat.Common.Test;
using Xunit;

Expand All @@ -32,10 +34,10 @@ public void DryIocDependencyResolver_Should_Resolve_Views()
var viewOne = Locator.Current.GetService(typeof(IViewFor<ViewModelOne>));
var viewTwo = Locator.Current.GetService(typeof(IViewFor<ViewModelTwo>));

viewOne.ShouldNotBeNull();
viewOne.ShouldBeOfType<ViewOne>();
viewTwo.ShouldNotBeNull();
viewTwo.ShouldBeOfType<ViewTwo>();
viewOne.Should().NotBeNull();
viewOne.Should().BeOfType<ViewOne>();
viewTwo.Should().NotBeNull();
viewTwo.Should().BeOfType<ViewTwo>();
}

/// <summary>
Expand All @@ -50,8 +52,8 @@ public void DryIocDependencyResolver_Should_Resolve_Named_View()

var viewTwo = Locator.Current.GetService(typeof(IViewFor<ViewModelTwo>), "Other");

viewTwo.ShouldNotBeNull();
viewTwo.ShouldBeOfType<ViewTwo>();
viewTwo.Should().NotBeNull();
viewTwo.Should().BeOfType<ViewTwo>();
}

/// <summary>
Expand All @@ -68,8 +70,8 @@ public void DryIocDependencyResolver_Should_Resolve_View_Models()
var vmOne = Locator.Current.GetService<ViewModelOne>();
var vmTwo = Locator.Current.GetService<ViewModelTwo>();

vmOne.ShouldNotBeNull();
vmTwo.ShouldNotBeNull();
vmOne.Should().NotBeNull();
vmTwo.Should().NotBeNull();
}

/// <summary>
Expand All @@ -84,8 +86,8 @@ public void DryIocDependencyResolver_Should_Resolve_Screen()

var screen = Locator.Current.GetService<IScreen>();

screen.ShouldNotBeNull();
screen.ShouldBeOfType<MockScreen>();
screen.Should().NotBeNull();
screen.Should().BeOfType<MockScreen>();
}

/// <summary>
Expand All @@ -98,11 +100,11 @@ public void DryIocDependencyResolver_Should_UnregisterCurrent_Screen()
builder.Register<IScreen, MockScreen>(Reuse.Singleton);
builder.UseDryIocDependencyResolver();

Locator.Current.GetService<IScreen>().ShouldNotBeNull();
Locator.Current.GetService<IScreen>().Should().NotBeNull();

Locator.CurrentMutable.UnregisterCurrent(typeof(IScreen));

Locator.Current.GetService<IScreen>().ShouldBeNull();
Locator.Current.GetService<IScreen>().Should().BeNull();
}

/// <summary>
Expand All @@ -115,11 +117,11 @@ public void DryIocDependencyResolver_Should_UnregisterCurrent_Screen_With_Contra
builder.Register<IScreen, MockScreen>(Reuse.Singleton, serviceKey: nameof(MockScreen));
builder.UseDryIocDependencyResolver();

Locator.Current.GetService<IScreen>(nameof(MockScreen)).ShouldNotBeNull();
Locator.Current.GetService<IScreen>(nameof(MockScreen)).Should().NotBeNull();

Locator.CurrentMutable.UnregisterCurrent(typeof(IScreen), nameof(MockScreen));

Locator.Current.GetService<IScreen>(nameof(MockScreen)).ShouldBeNull();
Locator.Current.GetService<IScreen>(nameof(MockScreen)).Should().BeNull();
}

/// <summary>
Expand All @@ -132,11 +134,11 @@ public void DryIocDependencyResolver_Should_UnregisterAll_Screen()
builder.Register<IScreen, MockScreen>(Reuse.Singleton);
builder.UseDryIocDependencyResolver();

Locator.Current.GetService<IScreen>().ShouldNotBeNull();
Locator.Current.GetService<IScreen>().Should().NotBeNull();

Locator.CurrentMutable.UnregisterAll(typeof(IScreen));

Locator.Current.GetService<IScreen>().ShouldBeNull();
Locator.Current.GetService<IScreen>().Should().BeNull();
}

/// <summary>
Expand All @@ -149,11 +151,11 @@ public void DryIocDependencyResolver_Should_UnregisterAll_Screen_With_Contract()
builder.Register<IScreen, MockScreen>(Reuse.Singleton, serviceKey: nameof(MockScreen));
builder.UseDryIocDependencyResolver();

Locator.Current.GetService<IScreen>(nameof(MockScreen)).ShouldNotBeNull();
Locator.Current.GetService<IScreen>(nameof(MockScreen)).Should().NotBeNull();

Locator.CurrentMutable.UnregisterAll(typeof(IScreen), nameof(MockScreen));

Locator.Current.GetService<IScreen>(nameof(MockScreen)).ShouldBeNull();
Locator.Current.GetService<IScreen>(nameof(MockScreen)).Should().BeNull();
}

/// <summary>
Expand All @@ -168,7 +170,7 @@ public void DryIocDependencyResolver_Should_Throw_If_ServiceRegistionCallback_Ca
var result = Record.Exception(() =>
Locator.CurrentMutable.ServiceRegistrationCallback(typeof(IScreen), disposable => { }));

result.ShouldBeOfType<NotImplementedException>();
result.Should().BeOfType<NotImplementedException>();
}

/// <summary>
Expand Down
34 changes: 19 additions & 15 deletions src/Splat.Microsoft.Extensions.DependencyInjection.Tests/DependencyResolverTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
// See the LICENSE file in the project root for full license information.

using System;

using FluentAssertions;

using Microsoft.Extensions.DependencyInjection;
using Shouldly;

using Splat.Common.Test;

using Xunit;

namespace Splat.Microsoft.Extensions.DependencyInjection.Tests
Expand All @@ -32,10 +36,10 @@ public void MicrosoftDependencyResolver_Should_Resolve_Views()
var viewOne = Locator.Current.GetService(typeof(IViewFor<ViewModelOne>));
var viewTwo = Locator.Current.GetService(typeof(IViewFor<ViewModelTwo>));

viewOne.ShouldNotBeNull();
viewOne.ShouldBeOfType<ViewOne>();
viewTwo.ShouldNotBeNull();
viewTwo.ShouldBeOfType<ViewTwo>();
viewOne.Should().NotBeNull();
viewOne.Should().BeOfType<ViewOne>();
viewTwo.Should().NotBeNull();
viewTwo.Should().BeOfType<ViewTwo>();
}

/// <summary>
Expand All @@ -52,8 +56,8 @@ public void MicrosoftDependencyResolver_Should_Resolve_Named_View()

var viewTwo = Locator.Current.GetService(typeof(IViewFor<ViewModelTwo>));

viewTwo.ShouldNotBeNull();
viewTwo.ShouldBeOfType<ViewTwo>();
viewTwo.Should().NotBeNull();
viewTwo.Should().BeOfType<ViewTwo>();
}

/// <summary>
Expand All @@ -72,8 +76,8 @@ public void MicrosoftDependencyResolver_Should_Resolve_View_Models()
var vmOne = Locator.Current.GetService<ViewModelOne>();
var vmTwo = Locator.Current.GetService<ViewModelTwo>();

vmOne.ShouldNotBeNull();
vmTwo.ShouldNotBeNull();
vmOne.Should().NotBeNull();
vmTwo.Should().NotBeNull();
}

/// <summary>
Expand All @@ -90,8 +94,8 @@ public void MicrosoftDependencyResolver_Should_Resolve_Screen()

var screen = Locator.Current.GetService<IScreen>();

screen.ShouldNotBeNull();
screen.ShouldBeOfType<MockScreen>();
screen.Should().NotBeNull();
screen.Should().BeOfType<MockScreen>();
}

/// <summary>
Expand All @@ -106,12 +110,12 @@ public void MicrosoftDependencyResolver_Should_UnregisterAll()
services.AddSingleton<IScreen>(new MockScreen());

Locator.CurrentMutable.HasRegistration(typeof(IScreen))
.ShouldBeTrue();
.Should().BeTrue();

Locator.CurrentMutable.UnregisterAll(typeof(IScreen));

var result = Locator.Current.GetService<IScreen>();
result.ShouldBeNull();
result.Should().BeNull();
}

/// <summary>
Expand All @@ -126,7 +130,7 @@ public void MicrosoftDependencyResolver_Should_Throw_If_ServiceRegistionCallback
var result = Record.Exception(() =>
Locator.CurrentMutable.ServiceRegistrationCallback(typeof(IScreen), disposable => { }));

result.ShouldBeOfType<NotImplementedException>();
result.Should().BeOfType<NotImplementedException>();
}

/// <summary>
Expand All @@ -141,7 +145,7 @@ public void MicrosoftDependencyResolver_Should_Throw_If_Attempt_Registration_Aft

var result = Record.Exception(() => Locator.CurrentMutable.Register(() => new ViewOne()));

result.ShouldBeOfType<InvalidOperationException>();
result.Should().BeOfType<InvalidOperationException>();
}
}
}
Loading

0 comments on commit 6474e1d

Please sign in to comment.