From 3f5e78a735a22bbd2e6f4aa96ac376340b7f3fe6 Mon Sep 17 00:00:00 2001 From: f-maeda Date: Thu, 6 Aug 2020 11:11:30 +0900 Subject: [PATCH] =?UTF-8?q?Name=20=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6?= =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=B1=E3=83=BC=E3=82=B9=E3=81=AB?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UniVRM/Editor/Tests/VRMBlendShapeKeyTest.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/VRM/UniVRM/Editor/Tests/VRMBlendShapeKeyTest.cs b/Assets/VRM/UniVRM/Editor/Tests/VRMBlendShapeKeyTest.cs index f72a18d20..a3aed5069 100644 --- a/Assets/VRM/UniVRM/Editor/Tests/VRMBlendShapeKeyTest.cs +++ b/Assets/VRM/UniVRM/Editor/Tests/VRMBlendShapeKeyTest.cs @@ -10,21 +10,22 @@ namespace VRM { static BlendShapeKey CreateBlendShapeKey(string name, BlendShapePreset preset) { - var argTypes = new Type[] { typeof(string), typeof(BlendShapePreset) }; + var argTypes = new Type[] {typeof(string), typeof(BlendShapePreset)}; // private constructor var constructor = typeof(BlendShapeKey).GetConstructor( BindingFlags.Instance | BindingFlags.NonPublic, null, argTypes, null); - return (BlendShapeKey)constructor.Invoke(new object[] { name, preset }); + return (BlendShapeKey) constructor.Invoke(new object[] {name, preset}); } [Test] public void KeyTest() { - var key = CreateBlendShapeKey("Blink", BlendShapePreset.Blink); - Assert.AreEqual(key, CreateBlendShapeKey("Blink", BlendShapePreset.Blink)); + var key = BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink); Assert.AreEqual(key, BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink)); + Assert.AreEqual(key, CreateBlendShapeKey("Blink", BlendShapePreset.Blink)); Assert.AreEqual(key, CreateBlendShapeKey("xxx", BlendShapePreset.Blink)); + Assert.AreEqual(key.Name, "Blink"); var dict = new Dictionary(); dict[key] = 1.0f; @@ -35,17 +36,23 @@ namespace VRM dict.Clear(); - var key2 = BlendShapeKey.CreateUnknown("Blink"); // name: Blink, Preset: Unknown + var key2 = BlendShapeKey.CreateUnknown("Blink"); // Name: Blink, Preset: Unknown dict[key2] = 1.0f; Assert.AreEqual(key2, CreateBlendShapeKey("Blink", BlendShapePreset.Unknown)); Assert.AreNotEqual(key2, BlendShapeKey.CreateUnknown("blink")); Assert.AreNotEqual(key2, CreateBlendShapeKey("Blink", BlendShapePreset.Blink)); Assert.AreNotEqual(key2, BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink)); + Assert.AreEqual(key2.Name, "Blink"); Assert.IsFalse(dict.ContainsKey(BlendShapeKey.CreateUnknown("blink"))); Assert.IsFalse(dict.ContainsKey(CreateBlendShapeKey("Blink", BlendShapePreset.Blink))); Assert.IsFalse(dict.ContainsKey(BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink))); + + var key3 = CreateBlendShapeKey("xxx", BlendShapePreset.Blink); // Unknown 以外は独自の名前を持てない + Assert.AreEqual(key3, BlendShapeKey.CreateFromPreset(BlendShapePreset.Blink)); + Assert.AreNotEqual(key3, CreateBlendShapeKey("xxx", BlendShapePreset.Unknown)); + Assert.AreEqual(key3.Name, "Blink"); } } }