Unity-Technologies
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXExpressionTests.cs‎
Lines changed: 20 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXExpressionTests.cs‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXGUITests.cs‎
Lines changed: 37 additions & 1 deletion b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXGUITests.cs‎
Lines changed: 37 additions & 1 deletion
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/08_Shadows.unity‎
Lines changed: 21 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/08_Shadows.unity‎
Lines changed: 21 additions & 0 deletions
@@ -236,6 +236,26 @@ public void ProcessExpressionMatrixToVector4s()
 
             Assert.AreEqual(new Vector4(1, 0, 0, 0), reduced.Get<Vector4>());
         }
+
+        [Test]
+        public void CheckExpressionRandomEquality()
+        {
+            var obj0 = new object();
+            var obj1 = new object();
+
+            var exp0 = new VFXExpressionRandom(true, new RandId(obj0));
+            var exp1 = new VFXExpressionRandom(true, new RandId(obj0));
+            var exp2 = new VFXExpressionRandom(false, new RandId(obj0));
+            var exp3 = new VFXExpressionRandom(true, new RandId(obj1));
+            var exp4 = new VFXExpressionRandom(true, new RandId(obj0, 1));
+
+            Assert.AreEqual(exp0, exp1);
+            Assert.AreEqual(exp0.GetHashCode(), exp1.GetHashCode());
+
+            Assert.AreNotEqual(exp0, exp2);
+            Assert.AreNotEqual(exp0, exp3);
+            Assert.AreNotEqual(exp0, exp4);
+        }
     }
 }
 #endif
@@ -4,6 +4,8 @@
 using UnityEngine;
 using UnityEngine.VFX;
 using UnityEditor.VFX;
+using UnityEngine.TestTools;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor.VFX.UI;
@@ -15,7 +17,7 @@ namespace UnityEditor.VFX.Test
     [TestFixture]
     public class VFXGUITests
     {
-        private const int testAssetCount = 8;
+        private const int testAssetCount = 9;
         private VisualEffectAsset[] m_GuiTestAssets = new VisualEffectAsset[testAssetCount];
 
         [OneTimeSetUp]
@@ -325,6 +327,40 @@ public void CreateAllOperatorsTest()
             CreateAllOperators();
         }
 
+
+        [UnityTest]
+        public IEnumerator CollapseTest()
+        {
+            EditTestAsset(8);
+
+            var builtInItem = VFXLibrary.GetOperators().Where(t => typeof(VFXBuiltInParameter).IsAssignableFrom(t.modelType)).First();
+
+            var builtIn = m_ViewController.AddVFXOperator(Vector2.zero, builtInItem);
+
+            yield return null;
+
+            builtIn.collapsed = true;
+
+            yield return null;
+
+            yield return null;
+
+            builtIn.collapsed = false;
+
+            yield return null;
+
+            yield return null;
+
+            builtIn.superCollapsed = true;
+
+            yield return null;
+
+            yield return null;
+
+            builtIn.superCollapsed = false;
+
+        }
+
         List<VFXOperator> CreateAllOperators()
         {
             List<VFXOperator> operators = new List<VFXOperator>();
 
@@ -734,6 +734,7 @@ GameObject:
   - component: {fileID: 1849253499}
   - component: {fileID: 1849253498}
   - component: {fileID: 1849253500}
+  - component: {fileID: 1849253501}
   m_Layer: 0
   m_Name: Visual_Effect_Shadow
   m_TagString: Untagged
@@ -833,3 +834,23 @@ VFXRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!114 &1849253501
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1849253497}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20f198885badb1f4fa1e65869995ff82, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ImageComparisonSettings:
+    TargetWidth: 512
+    TargetHeight: 512
+    PerPixelCorrectnessThreshold: 0
+    AverageCorrectnessThreshold: 0.00001
+    UseHDR: 0
+    UseBackBuffer: 0
+    ImageResolution: 0