[UUM-138957] Remove runtime test dependency on UnityEditor APIs

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+### Internal
+
+- [UUM-138957] Removed ProBuilder Runtime tests references to UnityEditor.
+
 ### Fixed
 
 - [UUM-133861] Fixed "Look rotation viewing vector is zero" log being spammed when holding shift while using a create tool such as Create Sprite.

Tests/Runtime/MeshOps/ProBuilderizeTests.cs → Tests/Editor/Import/MeshImporterTests.cs

@@ -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();
 

Tests/Framework/TestUtility.cs

@@ -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);

Tests/Framework/Unity.ProBuilder.Tests.Framework.asmdef

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

Tests/Runtime/MeshOps/BridgeEdgesTests.cs

@@ -4,7 +4,10 @@
 using UnityEngine.ProBuilder;
 using UnityEngine.ProBuilder.MeshOperations;
 using UnityEngine.ProBuilder.Shapes;
+using UnityEngine.ProBuilder.Tests;
+#if UNITY_EDITOR && PB_CREATE_TEST_MESH_TEMPLATES
 using UnityEngine.ProBuilder.Tests.Framework;
+#endif
 
 static class BridgeEdgesTests
 {
@@ -21,16 +24,16 @@ public static void Bridge_TwoEdges_CreatesQuad()
         cube.ToMesh();
         cube.Refresh();
 
-#if PB_CREATE_TEST_MESH_TEMPLATES
+#if UNITY_EDITOR && PB_CREATE_TEST_MESH_TEMPLATES
         TestUtility.SaveAssetTemplate(cube.mesh, cube.name);
 #endif
-        TestUtility.AssertMeshAttributesValid(cube.mesh);
-        var template = TestUtility.GetAssetTemplate<Mesh>(cube.name);
+        RuntimeUtility.AssertMeshAttributesValid(cube.mesh);
+        var template = Resources.Load<Mesh>(RuntimeUtility.GetResourcesPath<Mesh>(cube.name));
         Assert.IsNotNull(template);
-        TestUtility.AssertAreEqual(template, cube.mesh);
+        RuntimeUtility.AssertAreEqual(template, cube.mesh);
 
-        UnityEngine.Object.DestroyImmediate(cube);
-    }
+        Object.DestroyImmediate(cube);
+     }
 
     [Test]
     public static void Bridge_TwoConnectedEdges_CreatesTriangle()
@@ -45,14 +48,14 @@ public static void Bridge_TwoConnectedEdges_CreatesTriangle()
         cube.ToMesh();
         cube.Refresh();
 
-#if PB_CREATE_TEST_MESH_TEMPLATES
+#if UNITY_EDITOR && PB_CREATE_TEST_MESH_TEMPLATES
         TestUtility.SaveAssetTemplate(cube.mesh, cube.name);
 #endif
-        TestUtility.AssertMeshAttributesValid(cube.mesh);
-        var template = TestUtility.GetAssetTemplate<Mesh>(cube.name);
+        RuntimeUtility.AssertMeshAttributesValid(cube.mesh);
+        var template = Resources.Load<Mesh>(RuntimeUtility.GetResourcesPath<Mesh>(cube.name));
         Assert.IsNotNull(template);
-        TestUtility.AssertAreEqual(template, cube.mesh);
+        RuntimeUtility.AssertAreEqual(template, cube.mesh);
 
-        UnityEngine.Object.DestroyImmediate(cube);
+        Object.DestroyImmediate(cube);
     }
 }

Tests/Runtime/MeshOps/CalculateNormalsTests.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using UObject = UnityEngine.Object;
 using NUnit.Framework;
 using UnityEngine.ProBuilder;
-using UnityEngine.ProBuilder.Tests.Framework;
+using UnityEngine.ProBuilder.Tests;
 
 static class CalculateNormalsTests
 {
@@ -13,7 +12,7 @@ static class CalculateNormalsTests
     [Test]
     public static void Calculate_HardNormals_AreNormalized()
     {
-        using (var shapes = new TestUtility.BuiltInPrimitives())
+        using (var shapes = new RuntimeUtility.BuiltInPrimitives())
         {
             foreach (var pb in (IEnumerable<ProBuilderMesh>)shapes)
             {
@@ -35,7 +34,7 @@ public static void Calculate_HardNormals_AreNormalized()
     [Test]
     public static void Calculate_SoftNormals_AreNormalized()
     {
-        using (var shapes = new TestUtility.BuiltInPrimitives())
+        using (var shapes = new RuntimeUtility.BuiltInPrimitives())
         {
             foreach (var pb in (IEnumerable<ProBuilderMesh>)shapes)
             {
@@ -57,7 +56,7 @@ public static void Calculate_SoftNormals_AreNormalized()
     [Test]
     public static void Calculate_SoftNormals_AreSoft()
     {
-        using (var shapes = new TestUtility.BuiltInPrimitives())
+        using (var shapes = new RuntimeUtility.BuiltInPrimitives())
         {
             foreach (var pb in (IEnumerable<ProBuilderMesh>)shapes)
             {

Tests/Runtime/MeshOps/CollapseVerticesTests.cs

@@ -3,7 +3,10 @@
 using UnityEngine.ProBuilder;
 using UnityEngine.ProBuilder.MeshOperations;
 using UnityEngine.ProBuilder.Shapes;
+using UnityEngine.ProBuilder.Tests;
+#if UNITY_EDITOR && PB_CREATE_TEST_MESH_TEMPLATES
 using UnityEngine.ProBuilder.Tests.Framework;
+#endif
 
 static class CollapseVerticesTests
 {
@@ -18,14 +21,13 @@ public static void CollapseToFirst_MatchesTemplate()
         cube.ToMesh();
         cube.Refresh();
 
-#if PB_CREATE_TEST_MESH_TEMPLATES
+#if UNITY_EDITOR && PB_CREATE_TEST_MESH_TEMPLATES
         TestUtility.SaveAssetTemplate(cube.mesh, cube.name);
 #endif
-
-        TestUtility.AssertMeshAttributesValid(cube.mesh);
-        var template = TestUtility.GetAssetTemplate<Mesh>(cube.name);
+        RuntimeUtility.AssertMeshAttributesValid(cube.mesh);
+        var template = Resources.Load<Mesh>(RuntimeUtility.GetResourcesPath<Mesh>(cube.name));
         Assert.IsNotNull(template);
-        TestUtility.AssertAreEqual(template, cube.mesh);
+        RuntimeUtility.AssertAreEqual(template, cube.mesh);
 
         Object.DestroyImmediate(cube);
     }
@@ -39,14 +41,13 @@ public static void CollapseToCenter_MatchesTemplate()
         cube.ToMesh();
         cube.Refresh();
 
-#if PB_CREATE_TEST_MESH_TEMPLATES
+#if UNITY_EDITOR && PB_CREATE_TEST_MESH_TEMPLATES
         TestUtility.SaveAssetTemplate(cube.mesh, cube.name);
 #endif
-
-        TestUtility.AssertMeshAttributesValid(cube.mesh);
-        var template = TestUtility.GetAssetTemplate<Mesh>(cube.name);
+        RuntimeUtility.AssertMeshAttributesValid(cube.mesh);
+        var template = Resources.Load<Mesh>(RuntimeUtility.GetResourcesPath<Mesh>(cube.name));
         Assert.IsNotNull(template);
-        TestUtility.AssertAreEqual(template, cube.mesh);
+        RuntimeUtility.AssertAreEqual(template, cube.mesh);
 
         UnityEngine.Object.DestroyImmediate(cube);
     }

Tests/Runtime/MeshOps/CombineMeshesTests.cs

@@ -1,10 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using UObject = UnityEngine.Object;
 using NUnit.Framework;
 using UnityEngine.ProBuilder;
-using UnityEngine.ProBuilder.Tests.Framework;
 using UnityEngine.ProBuilder.MeshOperations;
 using UnityEngine.ProBuilder.Shapes;