resolved #125

Author: ymh199478

src/CatLib.Core.Tests/Support/Container/ContainerTests.cs

@@ -10,6 +10,7 @@
  */
 
 using System;
+using System.CodeDom;
 using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -2715,6 +2716,75 @@ public void TestNeedGivenWithParamName()
 
             Assert.AreEqual(200, container.Make<TestNeedGivenWithParamNameClass>().MyParam);
         }
+
+        [TestMethod]
+        public void TestNullRelease()
+        {
+            var container = new Container();
+            Assert.AreEqual(false, container.Release(null));
+        }
+
+        public class TestGivenInvalidTypeClass
+        {
+            public TestGivenInvalidTypeClass(Container container)
+            {
+                Assert.Fail();
+            }
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(UnresolvableException))]
+        public void TestGivenInvalidType()
+        {
+            var container = new Container();
+            container.Bind<TestGivenInvalidTypeClass>()
+                .Needs("$container").Given(() => 123);
+            container.Make<TestGivenInvalidTypeClass>();
+        }
+
+        public class TestGivenInvalidTypeAttrClass
+        {
+            [Inject]
+            public Container container { get; set; }
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(UnresolvableException))]
+        public void TestGivenInvalidTypeAttr()
+        {
+            var container = new Container();
+            container.Bind<TestGivenInvalidTypeAttrClass>()
+                .Needs("$container").Given(() => 123);
+            container.Make<TestGivenInvalidTypeAttrClass>();
+        }
+
+        public class NotSupportNullInject : Container
+        {
+            protected override bool CanInject(Type type, object instance)
+            {
+                return instance != null;
+            }
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(UnresolvableException))]
+        public void TestGivenInvalidTypeAttrNotSupportNullInject()
+        {
+            var container = new NotSupportNullInject();
+            container.Bind<TestGivenInvalidTypeAttrClass>()
+                .Needs("$container").Given(() => null);
+            container.Make<TestGivenInvalidTypeAttrClass>();
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(UnresolvableException))]
+        public void TestGivenInvalidTypeNotSupportNullInject()
+        {
+            var container = new NotSupportNullInject();
+            container.Bind<TestGivenInvalidTypeClass>()
+                .Needs("$container").Given(() => null);
+            container.Make<TestGivenInvalidTypeClass>();
+        }
         #endregion
 
         /// <summary>

src/CatLib.Core/Support/Container/Container.cs

@@ -1496,7 +1496,7 @@ protected virtual void AttributeInject(Bindable makeServiceBindData, object make
                 if (!CanInject(property.PropertyType, instance))
                 {
                     throw new UnresolvableException(
-                        $"[{makeServiceBindData.Service}]({makeServiceInstance.GetType()}) Attr inject type must be [{property.PropertyType}] , But instance is [{instance.GetType()}] , Make service is [{needService}].");
+                        $"[{makeServiceBindData.Service}]({makeServiceInstance.GetType()}) Attr inject type must be [{property.PropertyType}] , But instance is [{instance?.GetType()}] , Make service is [{needService}].");
                 }
 
                 property.SetValue(makeServiceInstance, instance, null);
@@ -1619,7 +1619,7 @@ protected virtual object[] GetDependencies(Bindable makeServiceBindData, Paramet
                 if (!CanInject(baseParam.ParameterType, param))
                 {
                     var error =
-                        $"[{makeServiceBindData.Service}] Params inject type must be [{baseParam.ParameterType}] , But instance is [{param.GetType()}]";
+                        $"[{makeServiceBindData.Service}] Params inject type must be [{baseParam.ParameterType}] , But instance is [{param?.GetType()}]";
                     if (needService == null)
                     {
                         error += " Inject params from user incoming parameters.";