throw InvalidOperationException in case a required service or a fromkeyedservice constructor argument can't be resolved. Also a change for GetRequiredService as behaviour was not the same and compliance tests were not testing this good

Author: DominicUllmann

src/Ninject.Web.AspNetCore.Test/Unit/DuplicateDescriptorTest.cs

@@ -66,7 +66,15 @@ public void BindingsFromKernel_ResolveWarrior_FailsWithActivationException(Resol
 			else
 			{
 				Action action = () => resolver.Resolve<IWarrior>(kernel);
-				action.Should().Throw<ActivationException>().WithMessage("Error activating IWarrior*");
+				if (resolver.ResolveType == ResolveType.ServiceProviderRequired)
+				{
+					action.Should().Throw<InvalidOperationException>().WithInnerException<ActivationException>()
+						.WithMessage("Error activating IWarrior*");
+				}
+				else
+				{
+					action.Should().Throw<ActivationException>().WithMessage("Error activating IWarrior*");
+				}
 			}
 		}
 
@@ -99,7 +107,15 @@ public void BindingsMixedWarriorDescriptors_ResolveWarrior_FailsWithActivationEx
 			else
 			{
 				Action action = () => resolver.Resolve<IWarrior>(kernel);
-				action.Should().Throw<ActivationException>().WithMessage("Error activating IWeapon*");
+				if (resolver.ResolveType == ResolveType.ServiceProviderRequired)
+				{
+					action.Should().Throw<InvalidOperationException>().WithInnerException<ActivationException>()
+						.WithMessage("Error activating IWeapon*");
+				}
+				else
+				{
+					action.Should().Throw<ActivationException>().WithMessage("Error activating IWeapon*");
+				}
 			}
 		}
 

src/Ninject.Web.AspNetCore.Test/Unit/ServiceProviderKeyedTest.cs

@@ -172,7 +172,7 @@ public void RequiredKeyedNonExisting_SingleServiceResolvedToException()
 			var provider = CreateServiceProvider(kernel);
 
 			Action action = () => provider.GetRequiredKeyedService(typeof(IWarrior), "Samurai");
-			action.Should().Throw<ActivationException>().WithMessage("*No matching bindings are available*");
+			action.Should().Throw<InvalidOperationException>().WithInnerException<ActivationException>().WithMessage("*No matching bindings are available*");
 		}
 
 		[Fact]

src/Ninject.Web.AspNetCore.Test/Unit/ServiceProviderTest.cs

@@ -86,7 +86,7 @@ public void RequiredNonExistingSingleServiceResolvedToException()
 			var provider = CreateServiceProvider(kernel);
 
 			Action action = () => provider.GetRequiredService(typeof(IWarrior));
-			action.Should().Throw<ActivationException>().WithMessage("*No matching bindings are available*");
+			action.Should().Throw<InvalidOperationException>().WithInnerException<ActivationException>().WithMessage("*No matching bindings are available*");
 		}
 
 		[Fact]
@@ -115,7 +115,7 @@ public void RequiredExistingMultipleServicesResolvedToExceptionWhenNotQueriedAsL
 			var provider = CreateServiceProvider(kernel);
 
 			Action action = () => provider.GetRequiredService(typeof(IWarrior));
-			action.Should().Throw<ActivationException>().WithMessage("*More than one matching bindings are available*");
+			action.Should().Throw<InvalidOperationException>().WithInnerException<ActivationException>().WithMessage("*More than one matching bindings are available*");
 		}
 
 		[Fact]

src/Ninject.Web.AspNetCore/NinjectServiceProvider.cs

@@ -46,7 +46,14 @@ public object GetRequiredService(Type serviceType)
 		{
 			if (!IsListType(serviceType, out var elementType))
 			{
-				return _resolutionRoot.Get(serviceType, metadata => !metadata.HasServiceKeyMetadata());
+				try
+				{
+					return _resolutionRoot.Get(serviceType, metadata => !metadata.HasServiceKeyMetadata());
+				}
+				catch (ActivationException ex)
+				{
+					throw new InvalidOperationException($"Can't resolve service of Type {serviceType}", ex);
+				}
 			}
 			else
 			{
@@ -117,7 +124,14 @@ public object GetRequiredKeyedService(Type serviceType, object serviceKey)
 			if (!IsListType(serviceType, out var elementType))
 			{
 				EnsureNotAnyKey(serviceKey, serviceType);
-				return ResolveKeyedService<object>(serviceType, serviceKey, true, false);
+				try
+				{
+					return ResolveKeyedService<object>(serviceType, serviceKey, true, false);
+				}
+				catch (ActivationException ex)
+				{
+					throw new InvalidOperationException($"Can't resolve service of Type {serviceType} with service key {serviceKey}", ex);
+				}
 			}
 			else
 			{

src/Ninject.Web.AspNetCore/Planning/ParameterTargetWithKeyedSupport.cs

@@ -63,10 +63,20 @@ private object ResolveFromKeyedService(IContext parent, FromKeyedServicesAttribu
 			var fromKeyedServiceValue = DeterimeFromKeyedServiceValue(keyedattribute, parent.Parameters);
 			var additionalConstraint = fromKeyedServiceValue != null
 				? metadata => metadata.DoesMetadataMatchServiceKey(fromKeyedServiceValue)
-				: (Func<IBindingMetadata, bool>) null;
-			var child = parent.Request.CreateKeyedChildRequest(Type, fromKeyedServiceValue, parent, this, additionalConstraint);
+				: (Func<IBindingMetadata, bool>)null;
+			var child = parent.Request.CreateKeyedChildRequest(Type, fromKeyedServiceValue, parent, this,
+				additionalConstraint);
 			child.IsUnique = true;
-			return parent.Kernel.Resolve(child).SingleOrDefault();
+			child.IsOptional = false; // constructor arguments marked with FromKeyedServices must always resolve, otherwise an InvalidOperationException is expected.
+			try
+			{
+				return parent.Kernel.Resolve(child).SingleOrDefault();
+			}
+			catch (ActivationException ex)
+			{
+				throw new InvalidOperationException(
+					$"Can't resolve keyed service of Type {Type} with key {fromKeyedServiceValue}", ex);
+			}
 		}
 
 		private object DeterimeFromKeyedServiceValue(