Undo changes to AssetDatabaseUtils that were not needed in the end.

Author: ekcoh

Packages/com.unity.inputsystem/Tests/TestFixture/AssetDatabaseUtils.cs

@@ -9,8 +9,6 @@ namespace UnityEngine.InputSystem
     /// Provides convenience functions for creating and managing assets for test purposes.
     /// Note that all returned paths are converted to Unix paths when running on Windows
     /// for consistency and to avoid mixed path names.
-    ///
-    /// This file should NOT be in this assembly, it should reside in the editor test assembly and be internal.
     public static class AssetDatabaseUtils
     {
         private const string kAssetPath = "Assets";
@@ -35,8 +33,7 @@ public static void ExternalMoveFileOrDirectory(string source, string dest)
         }
 
         // Create an asset at the given path containing the given text content.
-        private static T CreateAssetAtPath<T>(string path, string content)
-            where T : ScriptableObject
+        private static T CreateAssetAtPath<T>(string path, string content) where T : UnityEngine.Object
         {
             Debug.Assert(!File.Exists(path));
 
@@ -45,20 +42,9 @@ private static T CreateAssetAtPath<T>(string path, string content)
             {
                 CreateDirectories(Path.GetDirectoryName(path));
 
-                if (content != null)
-                {
-                    // Create asset as a file with explicit content
-                    File.WriteAllText(path, content);
-                    AssetDatabase.ImportAsset(path);
-                    obj = AssetDatabase.LoadAssetAtPath<T>(path);
-                }
-                else
-                {
-                    // Use default serialization (YAML) to create asset.
-                    obj = ScriptableObject.CreateInstance<T>();
-                    AssetDatabase.CreateAsset(obj, path);
-                }
-
+                File.WriteAllText(path, content);
+                AssetDatabase.ImportAsset(path);
+                obj = AssetDatabase.LoadAssetAtPath<T>(path);
                 if (obj == null)
                     throw new Exception($"Failed to create asset at \"{path}\"");
             }
@@ -113,8 +99,7 @@ public static string CreateDirectory()
 
         // Creates an asset in the given directory path with an explicit or random file name containing the
         // given content or the default content based on type.
-        public static T CreateAsset<T>(string directoryPath, string filename = null, string content = null)
-            where T : ScriptableObject
+        public static T CreateAsset<T>(string directoryPath, string filename = null, string content = null) where T : UnityEngine.Object
         {
             Debug.Assert(directoryPath == null || directoryPath.Contains(RootPath()));
             Debug.Assert(filename == null || !filename.Contains("/"));
@@ -139,7 +124,7 @@ public static T CreateAsset<T>(string directoryPath, string filename = null, str
         // Creates an asset at the given path containing the specified content.
         // If path is null, a unique random file name is assigned, if content is null the default content based
         // on type (extension) is used.
-        public static T CreateAsset<T>(string path = null, string content = null) where T : UnityEngine.ScriptableObject
+        public static T CreateAsset<T>(string path = null, string content = null) where T : UnityEngine.Object
         {
             if (path == null)
                 path = RandomAssetFilePath(RootPath(), AssetFileExtensionFromType(typeof(T)));
@@ -223,7 +208,7 @@ private static string DefaultContentFromType(Type type)
         {
             if (type == typeof(InputActionAsset))
                 return "{}";
-            return null;
+            return string.Empty;
         }
     }
 }