Skip to content

Commit

Permalink
Merge pull request #1798 from PrismLibrary/unity-upgrade
Browse files Browse the repository at this point in the history 
update the latest version of Unity
  • Loading branch information
@brianlagunas
brianlagunas committed May 16, 2019
2 parents d5569a5 + d294912 commit ff9641a
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 70 deletions.
2 changes: 0 additions & 2 deletions Source/Wpf/Prism.Unity.Wpf.Tests/UnityBootstrapperNullModuleManagerFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ private class NullModuleManagerBootstrapper : UnityBootstrapper
protected override void ConfigureContainer()
{
//base.RegisterDefaultTypesIfMissing();

this.Container.AddNewExtension<UnityBootstrapperExtension>();

Container.RegisterInstance<ILoggerFacade>(Logger);

Expand Down
34 changes: 15 additions & 19 deletions Source/Wpf/Prism.Unity.Wpf.Tests/UnityBootstrapperRunMethodFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public void RunRegistersInstanceOfILoggerFacade()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterInstance(typeof(ILoggerFacade), null, bootstrapper.BaseLogger, It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterInstance(typeof(ILoggerFacade), null, bootstrapper.BaseLogger, It.IsAny<IInstanceLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -211,7 +211,7 @@ public void RunRegistersInstanceOfIModuleCatalog()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterInstance(typeof(IModuleCatalog), null, It.IsAny<object>(), It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterInstance(typeof(IModuleCatalog), null, It.IsAny<object>(), It.IsAny<IInstanceLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -224,7 +224,7 @@ public void RunRegistersTypeForIServiceLocator()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterType(typeof(IServiceLocator), typeof(UnityServiceLocatorAdapter), null, It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterType(typeof(IServiceLocator), typeof(UnityServiceLocatorAdapter), null, It.IsAny<ITypeLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -237,7 +237,7 @@ public void RunRegistersTypeForIModuleInitializer()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterType(typeof(IModuleInitializer), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterType(typeof(IModuleInitializer), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -250,7 +250,7 @@ public void RunRegistersTypeForIRegionManager()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterType(typeof(IRegionManager), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterType(typeof(IRegionManager), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -263,7 +263,7 @@ public void RunRegistersTypeForRegionAdapterMappings()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterType(typeof(RegionAdapterMappings), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterType(typeof(RegionAdapterMappings), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -276,7 +276,7 @@ public void RunRegistersTypeForIRegionViewRegistry()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterType(typeof(IRegionViewRegistry), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterType(typeof(IRegionViewRegistry), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -289,7 +289,7 @@ public void RunRegistersTypeForIRegionBehaviorFactory()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterType(typeof(IRegionBehaviorFactory), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterType(typeof(IRegionBehaviorFactory), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -302,7 +302,7 @@ public void RunRegistersTypeForIEventAggregator()

bootstrapper.Run();

mockedContainer.Verify(c => c.RegisterType(typeof(IEventAggregator), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Once());
mockedContainer.Verify(c => c.RegisterType(typeof(IEventAggregator), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Once());
}

[StaFact]
Expand All @@ -314,11 +314,11 @@ public void RunFalseShouldNotRegisterDefaultServicesAndTypes()
var bootstrapper = new MockedContainerBootstrapper(mockedContainer.Object);
bootstrapper.Run(false);

mockedContainer.Verify(c => c.RegisterType(typeof(IEventAggregator), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(IRegionManager), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(RegionAdapterMappings), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(IServiceLocator), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(IModuleInitializer), It.IsAny<Type>(), null, It.IsAny<LifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(IEventAggregator), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(IRegionManager), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(RegionAdapterMappings), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(IServiceLocator), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Never());
mockedContainer.Verify(c => c.RegisterType(typeof(IModuleInitializer), It.IsAny<Type>(), null, It.IsAny<ITypeLifetimeManager>()), Times.Never());
}

[StaFact]
Expand All @@ -334,7 +334,6 @@ public void ModuleManagerRunCalled()
var regionBehaviorFactory = new RegionBehaviorFactory(serviceLocatorAdapter);

container.RegisterInstance<IServiceLocator>(serviceLocatorAdapter);
container.RegisterInstance<UnityBootstrapperExtension>(new UnityBootstrapperExtension());
container.RegisterInstance<IModuleCatalog>(new ModuleCatalog());
container.RegisterInstance<IModuleInitializer>(mockedModuleInitializer.Object);
container.RegisterInstance<IModuleManager>(mockedModuleManager.Object);
Expand Down Expand Up @@ -573,10 +572,7 @@ private static void SetupMockedContainerForVerificationTests(Mock<IUnityContaine

mockedContainer.Setup(c => c.Resolve(typeof(IServiceLocator), (string)null)).Returns(serviceLocatorAdapter);

mockedContainer.Setup(c => c.RegisterInstance(It.IsAny<Type>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<LifetimeManager>()));

mockedContainer.Setup(c => c.Resolve(typeof(UnityBootstrapperExtension), (string)null)).Returns(
new UnityBootstrapperExtension());
mockedContainer.Setup(c => c.RegisterInstance(It.IsAny<Type>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<IInstanceLifetimeManager>()));

mockedContainer.Setup(c => c.Resolve(typeof(IModuleCatalog), (string)null)).Returns(
new ModuleCatalog());
Expand Down
1 change: 0 additions & 1 deletion Source/Wpf/Prism.Unity.Wpf.Tests/UnityContainerExtensionFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public class UnityContainerExtensionFixture
public void ExtensionReturnsTrueIfThereIsAPolicyForType()
{
UnityContainer container = new UnityContainer();
container.AddNewExtension<UnityBootstrapperExtension>();

container.RegisterType<object, string>();
Assert.True(container.IsTypeRegistered(typeof(object)));
Expand Down
16 changes: 16 additions & 0 deletions Source/Wpf/Prism.Unity.Wpf.Tests/UnityServiceLocatorAdapterFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Unity.Extension;
using Unity.Registration;
using Unity.Lifetime;
using Unity.Injection;

namespace Prism.Unity.Wpf.Tests
{
Expand Down Expand Up @@ -114,6 +115,21 @@ public bool IsRegistered(Type type, string name)
throw new NotImplementedException();
}

public IUnityContainer RegisterType(Type registeredType, Type mappedToType, string name, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
{
throw new NotImplementedException();
}

public IUnityContainer RegisterInstance(Type type, string name, object instance, IInstanceLifetimeManager lifetimeManager)
{
throw new NotImplementedException();
}

public IUnityContainer RegisterFactory(Type type, string name, Func<IUnityContainer, Type, string, object> factory, IFactoryLifetimeManager lifetimeManager)
{
throw new NotImplementedException();
}

#endregion
}
}
Expand Down
1 change: 0 additions & 1 deletion Source/Wpf/Prism.Unity.Wpf/Legacy/UnityBootstrapper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ protected override void RegisterFrameworkExceptionTypes()
protected virtual void ConfigureContainer()
{
this.Logger.Log(Resources.AddingUnityBootstrapperExtensionToContainer, Category.Debug, Priority.Low);
this.Container.AddNewExtension<UnityBootstrapperExtension>();

Container.RegisterInstance<IContainerExtension>(ContainerExtension);
Container.RegisterInstance<ILoggerFacade>(Logger);
Expand Down
44 changes: 0 additions & 44 deletions Source/Wpf/Prism.Unity.Wpf/Legacy/UnityBootstrapperExtension.cs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Source/Wpf/Prism.Unity.Wpf/Legacy/UnityContainerHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static class UnityContainerHelper
/// </remarks>
public static bool IsTypeRegistered(this IUnityContainer container, Type type)
{
return UnityBootstrapperExtension.IsTypeRegistered(container, type);
return container.IsRegistered(type);
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Source/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Unity.Container" Version="5.8.13" />
<PackageReference Include="Unity.Container" Version="5.10.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Unity.Container" Version="5.8.13" />
<PackageReference Include="Unity.Container" Version="5.10.3" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit ff9641a

Please sign in to comment.