Added type check to Single<T>.Bind

Author: DerKekser

Assets/Kekser/PowerSingleton/Single.cs

@@ -4,7 +4,9 @@ namespace Kekser.PowerSingleton
 {
     public static class Single<T> where T : class
     {
-        private static Object _rawInstance;
+        private const string PowerSingletonCantBind = "PowerSingleton: Can't bind {0} to {1}";
+        
+        private static Object _rawInstance { get; set; }
         private static T _instance { get; set; }
 
         public static T Instance {
@@ -18,8 +20,19 @@ public static T Instance {
 
         public static void Bind(Object instance)
         {
+            if (instance == null)
+            {
+                _rawInstance = null;
+                _instance = null;
+                return;
+            }
+            if (!(instance is T tInstance))
+            {
+                Debug.LogErrorFormat(PowerSingletonCantBind, instance.GetType(), typeof(T));
+                return;
+            }
             _rawInstance = instance;
-            _instance = instance as T;
+            _instance = tInstance;
         }
     }
 }

Assets/Kekser/PowerSingleton/package.json

@@ -2,7 +2,7 @@
     "name": "com.kekser.powersingleton",
     "displayName": "PowerSingleton",
     "author": { "name": "Kekser", "url": "https://github.com/DerKekser" },
-    "version": "1.3.0",
+    "version": "1.3.1",
     "unity": "2020.3",
     "description": "A simple singleton system for Unity",
     "keywords": [ "singleton" ],

Assets/Kekser/Tests/PowerSingletonTests.cs

@@ -113,6 +113,20 @@ public IEnumerator TestBindSingleton()
         Assert.IsTrue(BindSingleton.Created);
         Assert.IsNotNull(Single<BindSingleton>.Instance);
     }
+    
+    [UnityTest]
+    [LoadScene("Assets/Kekser/Tests/Scenes/PowerSingletonTestScene.unity")]
+    public IEnumerator TestBindWrongSingleton()
+    {
+        yield return null;
+        Assert.IsFalse(BindSingleton.Created);
+        Single<BindSingleton>.Bind(new GameObject("BindSingleton").AddComponent<DefaultSingleton>());
+        LogAssert.Expect(LogType.Error, "PowerSingleton: Can't bind Kekser.Tests.DefaultSingleton to Kekser.Tests.BindSingleton");
+        yield return null;
+        Assert.IsFalse(BindSingleton.Created);
+        Assert.IsNull(Single<BindSingleton>.Instance);
+        LogAssert.Expect(LogType.Error, "PowerSingletonManager: No PowerSingletonAttribute for type Kekser.Tests.BindSingleton, and no instance in scene");
+    }
 }
 
 public class LoadSceneAttribute : NUnitAttribute, IOuterUnityTestAction