amacocian/Slim
1
0
Fork 0
mirror of https://github.com/AlexMacocian/Slim.git synced 2026-07-15 15:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase code coverage

Browse Source 
Fix exception handling
This commit is contained in:
Alexandru Victor Macocian
2021-09-07 12:55:58 +02:00
committed by GitHub
parent 89df62129d
commit 30705c58cc
13 changed files with 260 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Slim.Tests/Models/DependentOnPrivateCtrService.cs
+13
View File
@@ -0,0 +1,13 @@
namespace Slim.Tests.Models
{
public sealed class DependentOnPrivateCtrService : IDependentOnPrivateCtrService
{
private readonly IPrivateConstructorService privateConstructorService;
public DependentOnPrivateCtrService(
IPrivateConstructorService privateConstructorService)
{
this.privateConstructorService = privateConstructorService;
}
}
}
Slim.Tests/Models/DependentOnThrowingService.cs
+12
View File
@@ -0,0 +1,12 @@
namespace Slim.Tests.Models
{
public sealed class DependentOnThrowingService : IDependentOnThrowingService
{
private readonly IThrowingService throwingService;
public DependentOnThrowingService(IThrowingService throwingService)
{
this.throwingService = throwingService;
}
}
}
Slim.Tests/Models/DependentService2.cs
+12
View File
@@ -0,0 +1,12 @@
namespace Slim.Tests.Models
{
public sealed class DependentService2 : IDependentService2
{
public IndependentService IndependentService { get; }
public DependentService2(IndependentService independentService)
{
this.IndependentService = independentService;
}
}
}
Slim.Tests/Models/IDependentOnPrivateCtrService.cs
+6
View File
@@ -0,0 +1,6 @@
namespace Slim.Tests.Models
{
public interface IDependentOnPrivateCtrService
{
}
}
Slim.Tests/Models/IDependentOnThrowingService.cs
+6
View File
@@ -0,0 +1,6 @@
namespace Slim.Tests.Models
{
public interface IDependentOnThrowingService
{
}
}
Slim.Tests/Models/IDependentService2.cs
+7
View File
@@ -0,0 +1,7 @@
namespace Slim.Tests.Models
{
public interface IDependentService2
{
public IndependentService IndependentService { get; }
}
}
Slim.Tests/Models/IPrivateConstructorService.cs
+6
View File
@@ -0,0 +1,6 @@
namespace Slim.Tests.Models
{
public interface IPrivateConstructorService
{
}
}
Slim.Tests/Models/IThrowingService.cs
+6
View File
@@ -0,0 +1,6 @@
namespace Slim.Tests.Models
{
public interface IThrowingService
{
}
}
Slim.Tests/Models/PrivateConstructorService.cs
+9
View File
@@ -0,0 +1,9 @@
namespace Slim.Tests.Models
{
public sealed class PrivateConstructorService : IPrivateConstructorService
{
private PrivateConstructorService()
{
}
}
}
Slim.Tests/Models/ThrowingService.cs
+12
View File
@@ -0,0 +1,12 @@
using System;
namespace Slim.Tests.Models
{
public sealed class ThrowingService : IThrowingService
{
public ThrowingService()
{
throw new InvalidOperationException();
}
}
}
Slim.Tests/ServiceManagerTests.cs
+74 -2
View File
@@ -10,6 +10,66 @@ namespace Slim.Tests
[TestClass]
public class ServiceManagerTests
{
[TestMethod]
public void RegisterAndRetrieveServiceUsesExistingImplementationSingleton()
{
var di = new ServiceManager();
di.RegisterSingleton<IDependentService2, DependentService2>();
di.RegisterSingleton<IndependentService, IndependentService>();
var independentService = di.GetService<IndependentService>();
independentService.Should().NotBeNull();
var dependentService = di.GetService<IDependentService2>();
dependentService.Should().NotBeNull();
dependentService.IndependentService.Should().Be(independentService);
}
[TestMethod]
public void DependencyOnPrivateConstructorServiceThrows()
{
var di = new ServiceManager();
di.RegisterSingleton<IPrivateConstructorService, PrivateConstructorService>();
di.RegisterSingleton<IDependentOnPrivateCtrService, DependentOnPrivateCtrService>();
var action = new Action(() =>
{
di.GetService<IDependentOnPrivateCtrService>();
});
action.Should().Throw<DependencyInjectionException>();
}
[TestMethod]
public void DependencyOnThrowingServiceThrows()
{
var di = new ServiceManager();
di.RegisterSingleton<IThrowingService, ThrowingService>();
di.RegisterSingleton<IDependentOnThrowingService, DependentOnThrowingService>();
var action = new Action(() =>
{
di.GetService<IDependentOnThrowingService>();
});
action.Should().Throw<InvalidOperationException>();
}
[TestMethod]
public void ThrowingConstructorThrows()
{
var di = new ServiceManager();
di.RegisterSingleton<IThrowingService, ThrowingService>();
var action = new Action(() =>
{
di.GetService<IThrowingService>();
});
action.Should().Throw<InvalidOperationException>();
}
[TestMethod]
public void RetrieveThrowsNotRegistered()
{
@@ -215,7 +275,7 @@ namespace Slim.Tests
di.HandleException<InvalidOperationException>((sp, e) =>
{
thrown = true;
return false;
return true;
});
di.RegisterSingleton<IIndependentService, IndependentService>();
@@ -232,7 +292,7 @@ namespace Slim.Tests
di.HandleException<InvalidOperationException>((sp, e) =>
{
thrown = true;
return true;
return false;
});
di.RegisterSingleton<IIndependentService, IndependentService>();
@@ -331,6 +391,18 @@ namespace Slim.Tests
resolver.Called.Should().Be(1);
}
[TestMethod]
public void UseResolverWithoutRegisteringServiceCallsResolver()
{
var di = new ServiceManager();
var resolver = new IndependentServiceResolver();
di.RegisterResolver(resolver);
var service = di.GetService<IIndependentService>();
service.Should().NotBeNull();
service.Should().BeOfType<IndependentService>();
}
[TestMethod]
public void UseResolverCalledOnceForSingleton()
{
Slim/ServiceManager.cs
+94 -94
View File
@@ -63,7 +63,10 @@ namespace Slim
where TInterface : class
where TClass : TInterface
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(typeof(TClass), Lifetime.Transient, typeof(TInterface), serviceFactory);
}
@@ -91,7 +94,10 @@ namespace Slim
where TInterface : class
where TClass : TInterface
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(typeof(TClass), Lifetime.Singleton, typeof(TInterface), serviceFactory);
}
@@ -119,7 +125,10 @@ namespace Slim
where TInterface : class
where TClass : TInterface
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(typeof(TClass), Lifetime.Scoped, typeof(TInterface), serviceFactory);
}
@@ -143,7 +152,10 @@ namespace Slim
/// <exception cref="InvalidOperationException">Thrown when <see cref="ServiceManager"/> contains an entry for the provided interface type.</exception>
public void RegisterTransient(Type tInterface, Type tClass, Func<IServiceProvider, object> serviceFactory)
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(tClass, Lifetime.Transient, tInterface, serviceFactory);
}
@@ -167,7 +179,10 @@ namespace Slim
/// <exception cref="InvalidOperationException">Thrown when <see cref="ServiceManager"/> contains an entry for the provided interface type.</exception>
public void RegisterSingleton(Type tInterface, Type tClass, Func<IServiceProvider, object> serviceFactory)
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(tClass, Lifetime.Singleton, tInterface, serviceFactory);
}
@@ -191,7 +206,10 @@ namespace Slim
/// <exception cref="InvalidOperationException">Thrown when <see cref="ServiceManager"/> contains an entry for the provided interface type.</exception>
public void RegisterScoped(Type tInterface, Type tClass, Func<IServiceProvider, object> serviceFactory)
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(tClass, Lifetime.Scoped, tInterface, serviceFactory);
}
@@ -215,7 +233,10 @@ namespace Slim
/// <exception cref="InvalidOperationException">Thrown when <see cref="ServiceManager"/> contains an entry for the provided interface type.</exception>
public void RegisterSingleton<TClass>(Func<IServiceProvider, TClass> serviceFactory) where TClass : class
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(typeof(TClass), Lifetime.Singleton, null, serviceFactory);
}
@@ -239,7 +260,10 @@ namespace Slim
/// <exception cref="InvalidOperationException">Thrown when <see cref="ServiceManager"/> contains an entry for the provided interface type.</exception>
public void RegisterTransient<TClass>(Func<IServiceProvider, TClass> serviceFactory) where TClass : class
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(typeof(TClass), Lifetime.Transient, null, serviceFactory);
}
@@ -263,7 +287,10 @@ namespace Slim
/// <exception cref="InvalidOperationException">Thrown when <see cref="ServiceManager"/> contains an entry for the provided interface type.</exception>
public void RegisterScoped<TClass>(Func<IServiceProvider, TClass> serviceFactory) where TClass : class
{
if (serviceFactory is null) throw new ArgumentNullException(nameof(serviceFactory));
if (serviceFactory is null)
{
throw new ArgumentNullException(nameof(serviceFactory));
}
this.RegisterService(typeof(TClass), Lifetime.Scoped, null, serviceFactory);
}
@@ -412,6 +439,7 @@ namespace Slim
{
singleton.Dispose();
}
this.Factories.Clear();
this.ExceptionHandlers.Clear();
}
@@ -478,58 +506,24 @@ namespace Slim
}
private object PrepareAndGetService(Type tInterface)
{
try
return this.TryFunc(() =>
{
lock (this)
{
return this.GetObject(tInterface);
}
}
catch(Exception e)
{
if (this.ExceptionHandlers.TryGetValue(e.GetType(), out var handler))
{
var shouldThrow = (bool)handler.DynamicInvoke(this, e);
if (shouldThrow)
{
throw;
}
}
else
{
throw;
}
return null;
}
return this.GetObject(tInterface);
});
}
private void RegisterFactory(Type tinterface, Delegate factory)
{
try
this.TryAction(() =>
{
lock (this)
{
this.Factories[tinterface] = factory;
}
}
catch(Exception e)
{
if (this.ExceptionHandlers.TryGetValue(e.GetType(), out var handler))
{
var shouldThrow = (bool)handler.DynamicInvoke(this, e);
if (shouldThrow)
{
throw;
}
}
else
{
throw;
}
}
});
}
private void Map(Type tinterface, Type tclass, Lifetime lifetime)
{
try
this.TryAction(() =>
{
lock (this)
{
@@ -537,24 +531,10 @@ namespace Slim
{
throw new InvalidOperationException($"{nameof(ServiceManager)} already contains an entry for type {tinterface}");
}
this.InterfaceMapping[tinterface] = (tclass, lifetime);
}
}
catch(Exception e)
{
if (this.ExceptionHandlers.TryGetValue(e.GetType(), out var handler))
{
var shouldThrow = (bool)handler.DynamicInvoke(this, e);
if (shouldThrow)
{
throw;
}
}
else
{
throw;
}
}
});
}
private object GetObject(Type tInterface)
{
@@ -584,6 +564,7 @@ namespace Slim
{
this.Instances[type] = obj;
}
return obj;
}
@@ -603,7 +584,7 @@ namespace Slim
}
}
(var implementType, _) = InterfaceMapping[type];
(var implementType, _) = this.InterfaceMapping[type];
if (this.Factories.TryGetValue(type, out var factory))
{
return factory.DynamicInvoke(this);
@@ -619,25 +600,13 @@ namespace Slim
* If the parameters are missing, try with other constructors.
*/
if (!constructor.IsPublic)
var parameters = this.GetParameters(constructor.GetParameters());
if (parameters is null)
{
continue;
}
try
{
var parameters = this.GetParameters(constructor.GetParameters());
if (parameters is null)
{
continue;
}
return constructor.Invoke(parameters);
}
catch(DependencyInjectionException exception)
{
throw new DependencyInjectionException($"Could not instantiate service of type {implementType}!", exception);
}
return constructor.Invoke(parameters);
}
return null;
@@ -697,19 +666,6 @@ namespace Slim
return parameterImplementationList.ToArray();
}
private Dictionary<Type, object> GetSingletons()
{
var dictionary = new Dictionary<Type, object>();
foreach (var kvp in this.Instances)
{
if (this.InterfaceMapping.First(s => s.Value.Item1 == kvp.Key).Value.Item2 is Lifetime.Singleton)
{
dictionary.Add(kvp.Key, kvp.Value);
}
}
return dictionary;
}
private ServiceManager CreateScopeInner()
{
var interfaceMapping = new Dictionary<Type, (Type, Lifetime)>(this.InterfaceMapping);
@@ -733,5 +689,49 @@ namespace Slim
return new ServiceManager(interfaceMapping, new Dictionary<Type, object>(), factories, exceptionHandlers, resolvers);
}
private void TryAction(Action action)
{
try
{
action();
}
catch (Exception ex)
{
this.HandleException(ex);
}
}
private T TryFunc<T>(Func<T> action)
{
try
{
return action();
}
catch (Exception ex)
{
this.HandleException(ex);
}
return default;
}
private void HandleException(Exception exception)
{
if (exception is TargetInvocationException && exception.InnerException is not null)
{
exception = exception.InnerException;
}
if (this.ExceptionHandlers.TryGetValue(exception.GetType(), out var handler))
{
var shouldThrow = (bool)handler.DynamicInvoke(this, exception);
if (shouldThrow is false)
{
throw exception;
}
}
else
{
throw exception;
}
}
}
}
Slim/Slim.csproj
+3 -3
View File
@@ -8,10 +8,10 @@
<Company />
<Product></Product>
<Description>Service lifetime management and dependency injection framework.</Description>
<AssemblyVersion>1.5.1</AssemblyVersion>
<FileVersion>1.5.1</FileVersion>
<AssemblyVersion>1.5.2</AssemblyVersion>
<FileVersion>1.5.2</FileVersion>
<PackageProjectUrl>https://github.com/AlexMacocian/Slim</PackageProjectUrl>
<Version>1.5.1</Version>
<Version>1.5.2</Version>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseFile>LICENSE</PackageLicenseFile>