-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from Velir/issue-13
Adding new registration extensions for autofac, and fixing resolution…
- Loading branch information
Showing
10 changed files
with
254 additions
and
6 deletions.
There are no files selected for viewing
62 changes: 62 additions & 0 deletions
62
Jabberwocky.Autofac.Tests/Extensions/ResolutionExtensionsTEsts.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| using Autofac; | ||
| using Jabberwocky.Autofac.Extensions; | ||
| using NUnit.Framework; | ||
|
|
||
| namespace Jabberwocky.Autofac.Tests.Extensions | ||
| { | ||
| [TestFixture] | ||
| public class ResolutionExtensionsTests | ||
| { | ||
| private ContainerBuilder _builder; | ||
|
|
||
| [SetUp] | ||
| public void Setup() | ||
| { | ||
| _builder = new ContainerBuilder(); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ResolveWithoutExceptions_MissingRegistration_ReturnsNull() | ||
| { | ||
| var retVal = _builder.Build().ResolveWithoutExceptions<string>(); | ||
|
|
||
| Assert.IsNull(retVal); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ResolveWithoutExceptions_ThrowsOnResolve_ReturnsNull() | ||
| { | ||
| _builder.Register(c => | ||
| { | ||
| Assert.Fail(); | ||
| return "I Failed!"; | ||
| }); | ||
|
|
||
| Assert.IsNull(_builder.Build().ResolveWithoutExceptions<string>()); | ||
| } | ||
|
|
||
| [Test] | ||
| public void TryResolveWithoutExceptions_MissingRegistration_ReturnsNull() | ||
| { | ||
| string retVal; | ||
|
|
||
| Assert.IsFalse(_builder.Build().TryResolveWithoutExceptions(out retVal)); | ||
| Assert.IsNull(retVal); | ||
| } | ||
|
|
||
| [Test] | ||
| public void TryResolveWithoutExceptions_ThrowsOnResolve_ReturnsNull() | ||
| { | ||
| _builder.Register(c => | ||
| { | ||
| Assert.Fail(); | ||
| return "I Failed!"; | ||
| }); | ||
|
|
||
| string retVal; | ||
|
|
||
| Assert.IsFalse(_builder.Build().TryResolveWithoutExceptions(out retVal)); | ||
| Assert.IsNull(retVal); | ||
| } | ||
| } | ||
| } |
96 changes: 96 additions & 0 deletions
96
Jabberwocky.Autofac.Tests/Jabberwocky.Autofac.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{87913926-895A-422B-B462-EF685DCAE215}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>Jabberwocky.Autofac.Tests</RootNamespace> | ||
| <AssemblyName>Jabberwocky.Autofac.Tests</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> | ||
| <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> | ||
| <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath> | ||
| <IsCodedUITest>False</IsCodedUITest> | ||
| <TestProjectType>UnitTest</TestProjectType> | ||
| </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> | ||
| </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> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> | ||
| <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath> | ||
| <Private>True</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> | ||
| <Private>True</Private> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| </ItemGroup> | ||
| <Choose> | ||
| <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'"> | ||
| <ItemGroup> | ||
| <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | ||
| </ItemGroup> | ||
| </When> | ||
| <Otherwise /> | ||
| </Choose> | ||
| <ItemGroup> | ||
| <Compile Include="Extensions\ResolutionExtensionsTests.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="packages.config" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Jabberwocky.Autofac\Jabberwocky.Autofac.csproj"> | ||
| <Project>{315DCFFB-97B4-43E5-9ECF-3EDC7E32C93F}</Project> | ||
| <Name>Jabberwocky.Autofac</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Choose> | ||
| <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'"> | ||
| <ItemGroup> | ||
| <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| </ItemGroup> | ||
| </When> | ||
| </Choose> | ||
| <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> | ||
| <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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| // General Information about an assembly is controlled through the following | ||
| // set of attributes. Change these attribute values to modify the information | ||
| // associated with an assembly. | ||
| [assembly: AssemblyTitle("Jabberwocky.Autofac.Tests")] | ||
| [assembly: AssemblyDescription("")] | ||
| [assembly: AssemblyConfiguration("")] | ||
| [assembly: AssemblyCompany("Microsoft")] | ||
| [assembly: AssemblyProduct("Jabberwocky.Autofac.Tests")] | ||
| [assembly: AssemblyCopyright("Copyright © Microsoft 2016")] | ||
| [assembly: AssemblyTrademark("")] | ||
| [assembly: AssemblyCulture("")] | ||
|
|
||
| // Setting ComVisible to false makes the types in this assembly not visible | ||
| // to COM components. If you need to access a type in this assembly from | ||
| // COM, set the ComVisible attribute to true on that type. | ||
| [assembly: ComVisible(false)] | ||
|
|
||
| // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
| [assembly: Guid("87913926-895a-422b-b462-ef685dcae215")] | ||
|
|
||
| // Version information for an assembly consists of the following four values: | ||
| // | ||
| // Major Version | ||
| // Minor Version | ||
| // Build Number | ||
| // Revision | ||
| // | ||
| // You can specify all the values or you can default the Build and Revision Numbers | ||
| // by using the '*' as shown below: | ||
| // [assembly: AssemblyVersion("1.0.*")] | ||
| [assembly: AssemblyVersion("1.0.0.0")] | ||
| [assembly: AssemblyFileVersion("1.0.0.0")] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="Autofac" version="3.5.2" targetFramework="net45" /> | ||
| <package id="NUnit" version="2.6.4" targetFramework="net45" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| using Autofac; | ||
| using Autofac.Core; | ||
|
|
||
| namespace Jabberwocky.Autofac.Extensions | ||
| { | ||
| public static class ResolutionExtensions | ||
| { | ||
| public static bool TryResolveWithoutExceptions<T>(this IComponentContext context, out T instance) | ||
| { | ||
| try | ||
| { | ||
| return context.TryResolve(out instance); | ||
| } | ||
| catch (DependencyResolutionException) | ||
| { | ||
| } | ||
|
|
||
| instance = default(T); | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| public static T ResolveWithoutExceptions<T>(this IComponentContext context) | ||
| { | ||
| try | ||
| { | ||
| return context.Resolve<T>(); | ||
| } | ||
| catch (DependencyResolutionException) | ||
| { | ||
| } | ||
|
|
||
| return default(T); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters