Merge branch 'feature/animator-has-parameter' into develop

Author: ashblue

Assets/AdncAnimatorHelpers/Editor/Testing/AnimatorPlayback/TestAnimatorPlayback.cs

@@ -1,7 +1,7 @@
 using Adnc.AnimatorHelpers.Conditions;
 using Adnc.AnimatorHelpers.Variables;
 using Adnc.Utility.Testing;
-using AdncAnimatorHelpers.Editor.Testing.Utilities;
+using Adnc.AnimatorHelpers.Editors.Testing.Utilities;
 using NUnit.Framework;
 using UnityEngine;
 using Object = UnityEngine.Object;

Assets/AdncAnimatorHelpers/Editor/Testing/AnimatorStub/TestAnimatorStub.cs

@@ -1,10 +1,10 @@
-using AdncAnimatorHelpers.Editor.Testing.Utilities;
+using Adnc.Utility.Testing;
+using Adnc.AnimatorHelpers.Editors.Testing.Utilities;
 using NUnit.Framework;
 using UnityEngine;
 
-namespace Adnc.AnimatorHelpers.Editors.Testing.Examples {
-    [Category("Examples")]
-    public class TestAnimatorStub {
+namespace Adnc.AnimatorHelpers.Editors.Testing {
+    public class TestAnimatorStub : TestBase {
         private GameObject _go;
         private AnimatorStub _animStub;
 
@@ -19,10 +19,10 @@ public void Teardown () {
         }
 
         [Test]
-        public void FailsCreationIfNoGameObject () {
+        public void DoesNotFailCreationIfNoGameObject () {
             var stub = new AnimatorStub(null);
 
-            Assert.IsFalse(stub.IsValid);
+            Assert.IsTrue(stub.IsValid);
         }
 
         [Test]
@@ -131,5 +131,16 @@ public void PlayAdvancesToTheNextState () {
             var stateInfo = stub.Animator.GetCurrentAnimatorStateInfo(0);
             Assert.IsTrue(stateInfo.IsName(stateName));
         }
+
+        [Test]
+        public void RuntimeControllerNameSameAsCreationName () {
+            var stub = new AnimatorStub(_go);
+
+            stub.AnimatorCtrl.name = "asdf";
+            stub.InjectCtrl();
+
+            Assert.AreEqual(stub.AnimatorCtrl.name, stub.Animator.runtimeAnimatorController.name);
+            Assert.AreNotEqual(stub.Animator.gameObject.name, stub.Animator.runtimeAnimatorController.name);
+        }
     }
 }

Assets/AdncAnimatorHelpers/Editor/Testing/HasParameter.meta

@@ -0,0 +1,105 @@
+using System;
+using Adnc.AnimatorHelpers.Editors.Testing.Utilities;
+using Adnc.AnimatorHelpers.HasParameters;
+using Adnc.Utility.Testing;
+using NUnit.Framework;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace Adnc.AnimatorHelpers.Editors.Testing.HasParameters {
+    [TestFixture(Category = "HasParameter")]
+    public class TestAnimatorParameters : TestBase {
+        private AnimatorStub _stub;
+
+        [SetUp]
+        public void Setup () {
+            _stub = new AnimatorStub();
+        }
+
+        [TearDown]
+        public void Teardown () {
+            Object.DestroyImmediate(_stub.Animator.gameObject);
+            _stub = null;
+        }
+
+        [Test]
+        public void ErrorsOnNullAnimatorConstructor () {
+            Assert.Throws<ArgumentNullException>(() => { new AnimatorParameters(null); });
+        }
+
+        [Test]
+        public void DoesNotCrashOnNullAnimatorParameters () {
+            _stub.InjectCtrl();
+            var par = new AnimatorParameters(_stub.Animator);
+        }
+
+        [Test]
+        public void StoresAllParameters () {
+            _stub.AnimatorCtrl.AddParameter(new AnimatorControllerParameter {
+                name = "a",
+                defaultBool = true,
+                type = AnimatorControllerParameterType.Bool
+            });
+
+            _stub.InjectCtrl();
+            var par = new AnimatorParameters(_stub.Animator);
+
+            Assert.IsTrue(par.parameters.dic.ContainsKey("a"));
+        }
+
+        [Test]
+        public void StoresAllBools () {
+            _stub.AnimatorCtrl.AddParameter(new AnimatorControllerParameter {
+                name = "a",
+                defaultBool = true,
+                type = AnimatorControllerParameterType.Bool
+            });
+
+            _stub.InjectCtrl();
+            var par = new AnimatorParameters(_stub.Animator);
+
+            Assert.IsTrue(par.bools.dic.ContainsKey("a"));
+        }
+
+        [Test]
+        public void StoresAllFloats () {
+            _stub.AnimatorCtrl.AddParameter(new AnimatorControllerParameter {
+                name = "a",
+                defaultFloat = 1,
+                type = AnimatorControllerParameterType.Float
+            });
+
+            _stub.InjectCtrl();
+            var par = new AnimatorParameters(_stub.Animator);
+
+            Assert.IsTrue(par.floats.dic.ContainsKey("a"));
+        }
+
+        [Test]
+        public void StoresAllInts () {
+            _stub.AnimatorCtrl.AddParameter(new AnimatorControllerParameter {
+                name = "a",
+                defaultInt = 1,
+                type = AnimatorControllerParameterType.Int
+            });
+
+            _stub.InjectCtrl();
+            var par = new AnimatorParameters(_stub.Animator);
+
+            Assert.IsTrue(par.ints.dic.ContainsKey("a"));
+        }
+
+        [Test]
+        public void StoresAllTriggers () {
+            _stub.AnimatorCtrl.AddParameter(new AnimatorControllerParameter {
+                name = "a",
+                type = AnimatorControllerParameterType.Trigger
+            });
+
+            _stub.InjectCtrl();
+            var par = new AnimatorParameters(_stub.Animator);
+
+            Assert.IsTrue(par.triggers.dic.ContainsKey("a"));
+        }
+    }
+}

Assets/AdncAnimatorHelpers/Editor/Testing/HasParameter/TestAnimatorParameters.cs

@@ -0,0 +1,120 @@
+using System;
+using Adnc.AnimatorHelpers.Editors.Testing.Utilities;
+using Adnc.AnimatorHelpers.HasParameters;
+using Adnc.Utility.Testing;
+using NUnit.Framework;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace Adnc.AnimatorHelpers.Editors.Testing.HasParameters {
+    [TestFixture(Category = "HasParameter")]
+    public class TestAnimatorParametersCollection : TestBase {
+        private AnimatorParametersCollection _animParCol;
+        private AnimatorStub _stub;
+
+        [SetUp]
+        public void Setup () {
+            _animParCol = new AnimatorParametersCollection();
+            _stub = new AnimatorStub();
+
+            _stub.AnimatorCtrl.AddParameter(new AnimatorControllerParameter {
+                defaultBool = true,
+                name = "a",
+                type = AnimatorControllerParameterType.Bool
+            });
+        }
+
+        [TearDown]
+        public void Teardown () {
+            Object.DestroyImmediate(_stub.Animator.gameObject);
+            _stub = null;
+        }
+
+        [Test]
+        public void SetParameterReturnsAnimatorParameters () {
+            _stub.InjectCtrl();
+            var ps = _animParCol.SetParameters("a", _stub.Animator);
+
+            Assert.IsNotNull(ps);
+        }
+
+        [Test]
+        public void SetParameterStoresCachedAnimator () {
+            _stub.InjectCtrl();
+            var ps = _animParCol.SetParameters("a", _stub.Animator);
+            var psCache = _animParCol.GetParameters("a");
+
+            Assert.AreSame(ps, psCache);
+        }
+
+        [Test]
+        public void SetAnimatorEmptyStringErrors () {
+            Assert.Throws<ArgumentNullException>(() => {
+                _animParCol.SetParameters("", _stub.Animator);
+            });
+        }
+
+        [Test]
+        public void SetAnimatorNullStringErrors () {
+            Assert.Throws<ArgumentNullException>(() => {
+                _animParCol.SetParameters(null, _stub.Animator);
+            });
+        }
+
+        [Test]
+        public void SetAnimatorNullAnimatorErrors () {
+            Assert.Throws<ArgumentNullException>(() => {
+                _animParCol.SetParameters("a", null);
+            });
+        }
+
+        [Test]
+        public void GetMissingAnimatorParametersReturnsNull () {
+            Assert.IsNull(_animParCol.GetParameters("a"));
+        }
+
+        [Test]
+        public void GetParametersNullReturnsError () {
+            Assert.Throws<ArgumentNullException>(() => {
+                _animParCol.GetParameters(null);
+            });
+        }
+
+        [Test]
+        public void GetParametersEmptyStringReturnsError () {
+            Assert.Throws<ArgumentNullException>(() => {
+                _animParCol.GetParameters("");
+            });
+        }
+
+        [Test]
+        public void GetParametersAutoGeneratesCacheIfItDoesNotExist () {
+            _stub.InjectCtrl();
+            var psCache = _animParCol.GetParameters("a", _stub.Animator);
+
+            Assert.IsNotNull(psCache);
+            Assert.IsTrue(_animParCol.HasParameters("a"));
+        }
+
+        [Test]
+        public void GetParametersDoesNotAutoGenerateCacheIfItExists () {
+            _stub.InjectCtrl();
+            var ps = _animParCol.SetParameters("a", _stub.Animator);
+
+            Assert.AreSame(ps, _animParCol.GetParameters("a", _stub.Animator));
+        }
+
+        [Test]
+        public void HasParametersReturnsTrueIfParameters () {
+            _stub.InjectCtrl();
+            var ps = _animParCol.SetParameters("a", _stub.Animator);
+
+            Assert.IsTrue(_animParCol.HasParameters("a"));
+        }
+
+        [Test]
+        public void HasParametersReturnsFalseIfNoParameters () {
+            Assert.IsFalse(_animParCol.HasParameters("a"));
+        }
+    }
+}