chore: test updates

readyplayerme · Jan 10, 2025 · b6a872f · b6a872f
1 parent a334e20
commit b6a872f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Runtime/Core/Scripts/Animation/VoiceHandler.cs b/Runtime/Core/Scripts/Animation/VoiceHandler.cs
@@ -8,7 +8,6 @@
 using UnityEngine.Android;
 #endif
 
-
 namespace ReadyPlayerMe.Core
 {
     /// <summary>
@@ -111,9 +110,10 @@ public void InitializeAudio()
         {
             try
             {
+
                 if (AudioSource == null)
                 {
-                    AudioSource = gameObject.AddComponent<AudioSource>();
+                    AudioSource = GetComponent<AudioSource>() ?? gameObject.AddComponent<AudioSource>();
                 }
 
                 switch (AudioProvider)

diff --git a/Tests/Editor/AvatarConfigProcessorTests.cs b/Tests/Editor/AvatarConfigProcessorTests.cs
@@ -11,7 +11,7 @@ public class AvatarConfigProcessorTests
         private const string MORPHTARGETS_EXPECTED_DEFAULT = "mouthOpen,mouthSmile";
         private const string MORPHTARGETS_EXPECTED_NONE = "none";
         private const string AVATAR_QUERY_PARAMS_ACTUAL =
-            "pose=T&lod=0&textureAtlas=none&textureSizeLimit=1024&textureChannels=baseColor,normal,metallicRoughness,emissive,occlusion&useHands=false&useDracoMeshCompression=false&useMeshOptCompression=false";
+            "pose=T&lod=0&textureAtlas=none&textureSizeLimit=1024&textureChannels=baseColor,normal,metallicRoughness,emissive,occlusion&morphTargets=none&useHands=false&useDracoMeshCompression=false&useMeshOptCompression=false&textureFormat=jpeg";
         private readonly string[] morphTargetsDefault = { "mouthOpen", "mouthSmile" };
         private readonly string[] morphTargetsNone = { "none" };
         private readonly TextureChannel[] textureChannelsAll =

diff --git a/Tests/Editor/AvatarLoaderWindowTests.cs b/Tests/Editor/AvatarLoaderWindowTests.cs
@@ -17,8 +17,7 @@ public class AvatarLoaderWindowTests
         [TearDown]
         public void Cleanup()
         {
-            TestUtils.DeleteAvatarDirectoryIfExists(TestAvatarData.DefaultAvatarUri.Guid, true);
-            TestUtils.DeleteCachedAvatar(TestAvatarData.DefaultAvatarUri.Guid);
+            TestUtils.DeleteEditorAvatarDirectoryIfExists(TestAvatarData.DefaultAvatarUri.Guid, true);
             if (avatar != null)
             {
                 Object.DestroyImmediate(avatar);
@@ -46,7 +45,7 @@ public IEnumerator Avatar_Loaded_Stored_And_No_Overrides()
             {
                 yield return null;
                 avatar = GameObject.Find(TestAvatarData.DefaultAvatarUri.Guid);
-            } while (avatar == null && System.DateTime.Now.Subtract(time).Seconds < 5);
+            } while (avatar == null && System.DateTime.Now.Subtract(time).Seconds < 10);
 
             window.Close();
             Assert.IsNotNull(avatar);

diff --git a/Tests/Editor/Common/TestUtils.cs b/Tests/Editor/Common/TestUtils.cs
@@ -31,6 +31,15 @@ public static void DeleteAvatarDirectoryIfExists(string avatarGuid, bool recursi
             }
         }
 
+        public static void DeleteEditorAvatarDirectoryIfExists(string avatarGuid, bool recursive = false)
+        {
+            var path = $"{Application.dataPath}/Assets/Ready Player Me/Avatars/{avatarGuid}";
+            if (Directory.Exists(path))
+            {
+                Directory.Delete(path, recursive);
+            }
+        }
+
         public static void DeleteCachedAvatar(string avatarGuid)
         {
             var deleteAsset = AssetDatabase.DeleteAsset($"Assets/Ready Player Me/Avatars/{avatarGuid}");