[UUM-138957] Remove runtime test dependency on UnityEditor APIs (#664)

* moving assets to a Resources folder

* moving MeshImporter tests to editor tests

* Moving needed methods from TestUtility to RuntimeUtility

* updating runtime tests and asmdef

* adding last changes in tests assets

* Making the Framework tests Editor only

* Changelog

* reverting asmdef non-necessary changes

* clean test code

* moveing from DestroyImmediate to Destroy for runtime tests

Author: lopezt-unity

CHANGELOG.md

@@ -8,7 +8,7 @@
 using UnityEngine.ProBuilder.MeshOperations;
 using UnityEngine.ProBuilder.Shapes;
 
-class ProBuilderizeTests : TemporaryAssetTest
+class MeshImporterTests : TemporaryAssetTest
 {
     [Test]
     public static void ImportCube_MatchesDefaultCube()
@@ -50,20 +50,20 @@ public static void ImportQuads_MatchesWindingOrder()
         Assert.IsNotNull(source);
 
         var instance = (GameObject)UObject.Instantiate(source);
-            var mf = instance.gameObject.GetComponent<MeshFilter>();
-            var mr = instance.gameObject.GetComponent<MeshRenderer>();
+        var mf = instance.gameObject.GetComponent<MeshFilter>();
+        var mr = instance.gameObject.GetComponent<MeshRenderer>();
         var result = new GameObject().AddComponent<ProBuilderMesh>();
-            var importer = new MeshImporter(mf.sharedMesh, mr.sharedMaterials, result);
+        var importer = new MeshImporter(mf.sharedMesh, mr.sharedMaterials, result);
 
-            Assert.DoesNotThrow(() =>
+        Assert.DoesNotThrow(() =>
+        {
+            importer.Import(new MeshImportSettings()
             {
-                importer.Import(new MeshImportSettings()
-                {
-                    quads = true,
-                    smoothing = false,
-                    smoothingAngle = 1f
-                });
+                quads = true,
+                smoothing = false,
+                smoothingAngle = 1f
             });
+        });
 
         result.Rebuild();
 

…/Templates/UnityEngine.Mesh/Runtime.meta Tests/Editor/Import.metaTests/Templates/UnityEngine.Mesh/Runtime.meta renamed to Tests/Editor/Import.meta Tests/Templates/UnityEngine.Mesh/Runtime.meta renamed to Tests/Editor/Import.meta

@@ -85,53 +85,6 @@ public static string temporarySavedAssetsDirectory
             get { return k_TempDirectory; }
         }
 
-        public class BuiltInPrimitives : IDisposable, IEnumerable<ProBuilderMesh>
-        {
-            ProBuilderMesh[] m_Shapes;
-
-            public static ProBuilderMesh[] GetBasicShapes()
-            {
-                var shapes = Enum.GetValues(typeof(ShapeType)) as ShapeType[];
-                ProBuilderMesh[] primitives = new ProBuilderMesh[shapes.Length];
-
-                for (int i = 0, c = shapes.Length; i < c; i++)
-                {
-                    primitives[i] = ShapeGenerator.CreateShape(shapes[i]);
-                    primitives[i].GetComponent<MeshFilter>().sharedMesh.name = shapes[i].ToString();
-                }
-                return primitives;
-            }
-
-            public BuiltInPrimitives()
-            {
-                m_Shapes = GetBasicShapes();
-            }
-
-            public int Count { get { return m_Shapes.Length; } }
-
-            public ProBuilderMesh this[int i]
-            {
-                get { return m_Shapes[i]; }
-                set { m_Shapes[i] = value; }
-            }
-
-            public void Dispose()
-            {
-                for (int i = 0, c = m_Shapes.Length; i < c; i++)
-                    UObject.DestroyImmediate(m_Shapes[i].gameObject);
-            }
-
-            IEnumerator<ProBuilderMesh> IEnumerable<ProBuilderMesh>.GetEnumerator()
-            {
-                return ((IEnumerable<ProBuilderMesh>)m_Shapes).GetEnumerator();
-            }
-
-            public IEnumerator GetEnumerator()
-            {
-                return m_Shapes.GetEnumerator();
-            }
-        }
-
         public class IgnoreAssertScope : IDisposable
         {
             bool m_SavedState;
@@ -158,14 +111,6 @@ static string ToAssetPath(string path)
             return path.Replace("\\", "/").Replace(Application.dataPath, "Assets/");
         }
 
-        public static void AssertSequenceEqual<T>(IList<T> left, IList<T> right)
-        {
-            Assert.AreEqual(left.Count, right.Count, "Count");
-
-            for (int i = 0, c = left.Count; i < c; i++)
-                Assert.AreEqual(left[i], right[i], "index " + i);
-        }
-
         public static void AssertMeshAttributesValid(Mesh mesh)
         {
             int vertexCount = mesh.vertexCount;
@@ -529,45 +474,6 @@ public static Material greenMaterial
             get { return AssetDatabase.LoadAssetAtPath<Material>(k_GreenMaterialPath); }
         }
 
-        public static SimpleTuple<ProBuilderMesh, Face> CreateCubeWithNonContiguousMergedFace()
-        {
-            var cube = ShapeFactory.Instantiate<Cube>();
-
-            Assume.That(cube, Is.Not.Null);
-
-            int index = 1;
-            Face a = cube.faces[0], b = cube.faces[index++];
-            Assume.That(a, Is.Not.Null);
-            Assume.That(b, Is.Not.Null);
-
-            while (FacesAreAdjacent(cube, a, b) && index < cube.faceCount)
-                b = cube.faces[index++];
-
-            Assume.That(FacesAreAdjacent(cube, a, b), Is.False);
-
-            var res = MergeElements.Merge(cube, new Face[] { a, b });
-
-            return new SimpleTuple<ProBuilderMesh, Face>(cube, res);
-        }
-
-        static bool FacesAreAdjacent(ProBuilderMesh mesh, Face a, Face b)
-        {
-            for (int i = 0, c = a.edgesInternal.Length; i < c; i++)
-            {
-                var ea = mesh.GetSharedVertexHandleEdge(a.edgesInternal[i]);
-
-                for (int n = 0; n < b.edgesInternal.Length; n++)
-                {
-                    var eb = mesh.GetSharedVertexHandleEdge(b.edgesInternal[n]);
-
-                    if (ea == eb)
-                        return true;
-                }
-            }
-
-            return false;
-        }
-
         public static void AssertMeshIsValid(ProBuilderMesh mesh)
         {
             Assert.That(mesh, Is.Not.Null);

…ts/Runtime/MeshOps/ProBuilderizeTests.cs Tests/Editor/Import/MeshImporterTests.csTests/Runtime/MeshOps/ProBuilderizeTests.cs renamed to Tests/Editor/Import/MeshImporterTests.cs Tests/Runtime/MeshOps/ProBuilderizeTests.cs renamed to Tests/Editor/Import/MeshImporterTests.cs

@@ -6,7 +6,9 @@
     "optionalUnityReferences": [
         "TestAssemblies"
     ],
-    "includePlatforms": [],
+    "includePlatforms": [
+        "Editor"
+    ],
     "excludePlatforms": [],
     "allowUnsafeCode": false
 }