merge master

Author: sebastienlagarde

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXDataTests.cs

@@ -93,31 +93,16 @@ public void CheckDataType()
             Assert.IsInstanceOf<VFXDataParticle>(output.GetData());
         }
 
-        string tempFilePath = "Assets/Temp_vfxTest_Ddata.vfx";
-
-        VFXGraph MakeTemporaryGraph()
-        {
-            if (System.IO.File.Exists(tempFilePath))
-            {
-                AssetDatabase.DeleteAsset(tempFilePath);
-            }
-            var asset = VisualEffectAssetEditorUtility.CreateNewAsset(tempFilePath);
-            VisualEffectResource resource = asset.GetResource(); // force resource creation
-            VFXGraph graph = ScriptableObject.CreateInstance<VFXGraph>();
-            graph.visualEffectResource = resource;
-            return graph;
-        }
-
         [OneTimeTearDown]
         public void CleanUp()
         {
-            AssetDatabase.DeleteAsset(tempFilePath);
+            VFXTestCommon.DeleteAllTemporaryGraph();
         }
 
         [Test]
         public void CheckName_Sharing_Between_Output_Event()
         {
-            var graph = MakeTemporaryGraph();
+            var graph = VFXTestCommon.MakeTemporaryGraph();
 
             var gameObj = new GameObject("CheckData_Sharing_Between_Output_Event");
             var vfxComponent = gameObj.AddComponent<VisualEffect>();

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXSerializationTests.cs

@@ -28,6 +28,38 @@ private VisualEffectAsset CreateAssetAtPath(string path)
             return VisualEffectAssetEditorUtility.CreateNewAsset(path);
         }
 
+        [Test]
+        public void Sanitize_GetSpawnCount()
+        {
+            string kSourceAsset = "Assets/AllTests/Editor/Tests/VFXSerializationTests_GetSpawnCount.vfx_";
+            var graph = VFXTestCommon.CopyTemporaryGraph(kSourceAsset);
+
+            Assert.AreEqual(5, graph.children.OfType<VFXAttributeParameter>().Count());
+            Assert.AreEqual(5, graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(uint)).Count());
+            Assert.AreEqual(1, graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(float)).Count());
+            Assert.AreEqual(1, graph.children.OfType<Operator.Add>().Count());
+            Assert.AreEqual(1, graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(Color)).Count());
+
+            foreach (var attribute in graph.children.OfType<VFXAttributeParameter>())
+                Assert.IsTrue(attribute.outputSlots[0].HasLink());
+
+            foreach (var inlineUInt in graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(uint)))
+                Assert.IsTrue(inlineUInt.inputSlots[0].HasLink());
+
+            foreach (var inlineFloat in graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(float)))
+                Assert.IsTrue(inlineFloat.inputSlots[0].HasLink());
+
+            foreach (var inlineColor in graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(Color)))
+                Assert.IsTrue(inlineColor.inputSlots[0].HasLink());
+
+            foreach (var add in graph.children.OfType<Operator.Add>())
+            {
+                Assert.AreEqual(2, add.operandCount);
+                Assert.IsTrue(add.inputSlots[0].HasLink());
+                Assert.IsTrue(add.inputSlots[1].HasLink());
+            }
+        }
+
         [OneTimeSetUpAttribute]
         public void OneTimeSetUpAttribute()
         {