Merge pull request #121 from CatLib/feature/1.3.0-alpha.3

Feature/1.3.0 alpha.3

Author: 喵喵大人

README.md

@@ -14,10 +14,6 @@
 
 > We are currently preparing to convert the comments in the code to the English version. We look forward to your joining.
 
-> CatLib Framework 请访问：[CatLib/Framework](https://github.com/CatLib/Framework)
-
-> CatLib For Unity 请访问：[CatLib/CatLib](https://github.com/CatLib/CatLib)
-
 ## 关于CatLib
 
 `CatLib Core` 是 `CatLib` 的最小可用框架。仅提供最基础的功能，是其他框架开发者作为基础的理想选择。

src/CatLib.Core.Tests/CatLib.Core.Tests.csproj

@@ -37,6 +37,7 @@
     <Compile Include="CatLib\ApplicationTests.cs" />
     <Compile Include="CatLib\FacaedTests.cs" />
     <Compile Include="CatLib\GlobalDispatcherTests.cs" />
+    <Compile Include="CatLib\TypeExtendTests.cs" />
     <Compile Include="Support\Container\ContainerPerformanceTests.cs" />
     <Compile Include="Support\Container\MethodContainerTests.cs" />
     <Compile Include="Support\Dispatcher\DispatcherTests.cs" />

src/CatLib.Core.Tests/CatLib/ApplicationTests.cs

@@ -1,12 +1,12 @@
 /*
  * This file is part of the CatLib package.
  *
- * (c) Yu Bin <[email protected]>
+ * (c) CatLib <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * Document: http://catlib.io/
+ * Document: https://catlib.io/
  */
 
 using System;
@@ -242,7 +242,16 @@ public void TestTerminate()
                 Assert.AreEqual(1, num++);
             });
             App.Terminate();
-            Assert.AreNotEqual(oldApp, App.Handler);
+            var isCall = false;
+            try
+            {
+                Assert.AreNotEqual(oldApp, App.Handler);
+            }
+            catch (LogicException)
+            {
+                isCall = true;
+            }
+            Assert.AreEqual(true, isCall);
             Assert.AreEqual(2, num);
         }
 

src/CatLib.Core.Tests/CatLib/FacaedTests.cs

@@ -1,12 +1,12 @@
 /*
  * This file is part of the CatLib package.
  *
- * (c) Yu Bin <[email protected]>
+ * (c) CatLib <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * Document: http://catlib.io/
+ * Document: https://catlib.io/
  */
 
 using System;
@@ -345,5 +345,12 @@ public void TestStructBindToSingleRebound()
             Assert.AreEqual(300, Facade<int>.Instance);
             Assert.AreEqual(4, makeCount);
         }
+
+        [TestMethod]
+        [ExpectedException(typeof(UnresolvableException))]
+        public void TestEmptyFacade()
+        {
+            var ins = Facade<IBindData>.Instance;
+        }
     }
 }

src/CatLib.Core.Tests/CatLib/GlobalDispatcherTests.cs

@@ -1,12 +1,12 @@
 /*
  * This file is part of the CatLib package.
  *
- * (c) Yu Bin <[email protected]>
+ * (c) CatLib <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * Document: http://catlib.io/
+ * Document: https://catlib.io/
  */
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;

src/CatLib.Core.Tests/CatLib/TypeExtendTests.cs

@@ -0,0 +1,26 @@
+/*
+ * This file is part of the CatLib package.
+ *
+ * (c) CatLib <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Document: https://catlib.io/
+ */
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace CatLib.Core.Tests
+{
+    [TestClass]
+    public class TypeExtendTests
+    {
+        [TestMethod]
+        public void TestGetService()
+        {
+            var app = new Application();
+            Assert.AreEqual(App.Type2Service<TypeExtendTests>(), typeof(TypeExtendTests).ToService());
+        }
+    }
+}

src/CatLib.Core.Tests/ExceptionAssert.cs

@@ -1,12 +1,12 @@
 /*
  * This file is part of the CatLib package.
  *
- * (c) Yu Bin <[email protected]>
+ * (c) CatLib <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * Document: http://catlib.io/
+ * Document: https://catlib.io/
  */
 
 using System;

src/CatLib.Core.Tests/Properties/AssemblyInfo.cs

@@ -1,12 +1,12 @@
 /*
  * This file is part of the CatLib package.
  *
- * (c) Yu Bin <[email protected]>
+ * (c) CatLib <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * Document: http://catlib.io/
+ * Document: https://catlib.io/
  */
 
 using System.Reflection;

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

@@ -1,12 +1,12 @@
 /*
  * This file is part of the CatLib package.
  *
- * (c) Yu Bin <[email protected]>
+ * (c) CatLib <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * Document: http://catlib.io/
+ * Document: https://catlib.io/
  */
 
 using System;
@@ -71,7 +71,7 @@ public void CanGetContextual()
 
             Assert.AreEqual("abc", bindData.GetContextual("need1"));
             Assert.AreEqual(container.Type2Service(typeof(BindDataTest)), bindData.GetContextual("need2"));
-            Assert.AreEqual("empty", bindData.GetContextual("empty"));
+            Assert.AreEqual(null, bindData.GetContextual("empty"));
         }
         #endregion
 

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

@@ -1,12 +1,12 @@
 /*
  * This file is part of the CatLib package.
  *
- * (c) Yu Bin <[email protected]>
+ * (c) CatLib <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * Document: http://catlib.io/
+ * Document: https://catlib.io/
  */
 
 using System;
@@ -62,7 +62,12 @@ public void BindSingleton()
             Assert.AreSame(obj, container.Make("BindSingleton"));
         }
 
-        public class ContainerHelperTestClass
+        public interface IContainerHelperTestClass
+        {
+            
+        }
+
+        public class ContainerHelperTestClass : IContainerHelperTestClass
         {
 
         }
@@ -79,11 +84,9 @@ public class TestClassService
         public void BindSingletonTServiceTConcrete()
         {
             var container = MakeContainer();
-            container.Singleton<TestClassService, ContainerHelperTestClass>();
-            var obj = container.Make(container.Type2Service(typeof(ContainerHelperTestClass)));
-            var obj2 = container.Make(container.Type2Service(typeof(TestClassService)));
-
-            Assert.AreSame(obj, obj2);
+            container.Singleton<IContainerHelperTestClass, ContainerHelperTestClass>();
+            var obj = container.Make(container.Type2Service(typeof(IContainerHelperTestClass)));
+            Assert.AreNotEqual(null, obj);
         }
 
         /// <summary>
@@ -146,10 +149,10 @@ public void TestBindIf()
             Assert.AreEqual(true, App.BindIf<int>(() => 100, out bindData));
             Assert.AreEqual(100, App.Make<int>());
             Assert.AreEqual(100, App.Make<int>()); // double get check
-            Assert.AreEqual(true, App.BindIf<double, float>(out bindData));
-            Assert.AreEqual(false, App.BindIf<double, float>(out bindData));
+            Assert.AreEqual(true, App.BindIf<float, float>(out bindData));
+            Assert.AreEqual(false, App.BindIf<float, float>(out bindData));
 
-            Assert.AreEqual(typeof(double), App.Make<double>(App.Type2Service(typeof(float))).GetType());
+            Assert.AreEqual(typeof(float), App.Make<float>(App.Type2Service(typeof(float))).GetType());
         }
 
         [TestMethod]
@@ -172,10 +175,10 @@ public void TestSingletonIf()
             Assert.AreEqual(true, App.SingletonIf<long>((c, p) => 100, out bindData));
             Assert.AreEqual(true, App.SingletonIf<int>(() => 100, out bindData));
             Assert.AreEqual(100, App.Make<int>());
-            Assert.AreEqual(true, App.SingletonIf<double, float>(out bindData));
-            Assert.AreEqual(false, App.SingletonIf<double, float>(out bindData));
+            Assert.AreEqual(true, App.SingletonIf<float, float>(out bindData));
+            Assert.AreEqual(false, App.SingletonIf<float, float>(out bindData));
 
-            Assert.AreEqual(typeof(double), App.Make<double>(App.Type2Service(typeof(float))).GetType());
+            Assert.AreEqual(typeof(float), App.Make<float>(App.Type2Service(typeof(float))).GetType());
         }
 
         [TestMethod]