Unity-Technologies
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/CopyPasteTest.vfx‎
Lines changed: 55 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/CopyPasteTest.vfx‎
Lines changed: 55 additions & 0 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/Indeterminate Test.vfx‎
Lines changed: 307 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/Indeterminate Test.vfx‎
Lines changed: 307 additions & 0 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXComponentTest.cs‎
Lines changed: 21 additions & 25 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXComponentTest.cs‎
Lines changed: 21 additions & 25 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXExpressionTests.cs‎
Lines changed: 26 additions & 6 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXExpressionTests.cs‎
Lines changed: 26 additions & 6 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXOperatorUtilityTests.cs‎
Lines changed: 11 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXOperatorUtilityTests.cs‎
Lines changed: 11 additions & 0 deletions
@@ -1285,32 +1285,28 @@ public IEnumerator CreateComponentWithAllBasicTypeExposed([ValueSource("trueOrFa
                 var currentName = commonBaseName + parameter.model.type.UserFriendlyName();
                 vfxComponent.ResetOverride(currentName);
 
+                var baseValue = GetValue_A_Type(parameter.model.type);
+                object currentValue = null;
+                if (bindingModes)
+                    currentValue = fnGet_UsingBindings(type, vfxComponent, currentName);
+                else
+                    currentValue = fnGet_UsingSerializedProperty(type, vfxComponent, currentName);
+                if (type == VFXValueType.ColorGradient)
                 {
-#if CASE_1206890_HAS_BEEN_FIXED
-                    var baseValue = GetValue_B_Type(parameter.model.type);
-                    object currentValue = null;
-                    if (bindingModes)
-                        currentValue = fnGet_UsingBindings(type, vfxComponent, currentName);
-                    else
-                        currentValue = fnGet_UsingSerializedProperty(type, vfxComponent, currentName);
-                    if (type == VFXValueType.ColorGradient)
-                    {
-                        Assert.IsTrue(fnCompareGradient((Gradient)baseValue, (Gradient)currentValue));
-                    }
-                    else if (type == VFXValueType.Curve)
-                    {
-                        Assert.IsTrue(fnCompareCurve((AnimationCurve)baseValue, (AnimationCurve)currentValue));
-                    }
-                    else if (bindingModes && parameter.model.type == typeof(Color))
-                    {
-                        Color col = (Color)baseValue;
-                        Assert.AreEqual(new Vector4(col.r, col.g, col.b, col.a), currentValue);
-                    }
-                    else
-                    {
-                        Assert.AreEqual(baseValue, currentValue);
-                    }
-#endif
+                    Assert.IsTrue(fnCompareGradient((Gradient)baseValue, (Gradient)currentValue));
+                }
+                else if (type == VFXValueType.Curve)
+                {
+                    Assert.IsTrue(fnCompareCurve((AnimationCurve)baseValue, (AnimationCurve)currentValue));
+                }
+                else if (parameter.model.type == typeof(Color))
+                {
+                    Color col = (Color)baseValue;
+                    Assert.AreEqual(new Vector4(col.r, col.g, col.b, col.a), currentValue);
+                }
+                else
+                {
+                    Assert.AreEqual(baseValue, currentValue);
                 }
 
                 if (!bindingModes)
 
@@ -114,12 +114,12 @@ private static void TestConditions(float f0, float f1)
             var f0Exp = VFXValue.Constant(f0);
             var f1Exp = VFXValue.Constant(f1);
 
-            var equalExp = new VFXExpressionCondition(VFXCondition.Equal, f0Exp, f1Exp);
-            var notEqualExp = new VFXExpressionCondition(VFXCondition.NotEqual, f0Exp, f1Exp);
-            var lessExp = new VFXExpressionCondition(VFXCondition.Less, f0Exp, f1Exp);
-            var lessOrEqualExp = new VFXExpressionCondition(VFXCondition.LessOrEqual, f0Exp, f1Exp);
-            var greater = new VFXExpressionCondition(VFXCondition.Greater, f0Exp, f1Exp);
-            var greaterOrEqual = new VFXExpressionCondition(VFXCondition.GreaterOrEqual, f0Exp, f1Exp);
+            var equalExp = new VFXExpressionCondition(VFXValueType.Float, VFXCondition.Equal, f0Exp, f1Exp);
+            var notEqualExp = new VFXExpressionCondition(VFXValueType.Float, VFXCondition.NotEqual, f0Exp, f1Exp);
+            var lessExp = new VFXExpressionCondition(VFXValueType.Float, VFXCondition.Less, f0Exp, f1Exp);
+            var lessOrEqualExp = new VFXExpressionCondition(VFXValueType.Float, VFXCondition.LessOrEqual, f0Exp, f1Exp);
+            var greater = new VFXExpressionCondition(VFXValueType.Float, VFXCondition.Greater, f0Exp, f1Exp);
+            var greaterOrEqual = new VFXExpressionCondition(VFXValueType.Float, VFXCondition.GreaterOrEqual, f0Exp, f1Exp);
 
             var context = new VFXExpression.Context(VFXExpressionContextOption.CPUEvaluation);
             var resultA = context.Compile(equalExp);
@@ -283,6 +283,26 @@ public void OuputExpression_From_Slot_Mesh_Should_Be_Invalid_Constant_Propagatio
             Assert.IsAssignableFrom(typeof(VFXExpressionAdd), reducedAfterLink);
             Assert.IsAssignableFrom(typeof(VFXValue<uint>), reducedAfterLinkCPUEvaluation);
         }
+
+        [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
@@ -628,6 +628,17 @@ public void ProcessOperatorCross()
             Assert.AreEqual(expectedValue.y, resultValue.y, 0.001f);
             Assert.AreEqual(expectedValue.z, resultValue.z, 0.001f);
         }
+
+        static readonly string[] CheckAllBuiltinExpressionAreListed_ValueSource = VFXBuiltInExpression.All.Select(o => o.ToString()).ToArray();
+
+        [Test]
+        public void CheckBuiltinExpressionListed([ValueSource("CheckAllBuiltinExpressionAreListed_ValueSource")] string expressionName)
+        {
+            var operation = (UnityEngine.VFX.VFXExpressionOperation)Enum.Parse(typeof(UnityEngine.VFX.VFXExpressionOperation), expressionName);
+            var referenceExpression = VFXBuiltInExpression.Find(operation);
+            Assert.IsTrue(VFXDynamicBuiltInParameter.s_BuiltInInfo.Values.Any(o => o.expression == referenceExpression));
+
+        }
     }
 }
 #endif
Original file line number	Diff line number	Diff line change
`@@ -628,6 +628,17 @@ public void ProcessOperatorCross()`
`628`	`628`	`Assert.AreEqual(expectedValue.y, resultValue.y, 0.001f);`
`629`	`629`	`Assert.AreEqual(expectedValue.z, resultValue.z, 0.001f);`
`630`	`630`	`}`
	`631`	`+`
	`632`	`+ static readonly string[] CheckAllBuiltinExpressionAreListed_ValueSource = VFXBuiltInExpression.All.Select(o => o.ToString()).ToArray();`
	`633`	`+`
	`634`	`+ [Test]`
	`635`	`+ public void CheckBuiltinExpressionListed([ValueSource("CheckAllBuiltinExpressionAreListed_ValueSource")] string expressionName)`
	`636`	`+ {`
	`637`	`+ var operation = (UnityEngine.VFX.VFXExpressionOperation)Enum.Parse(typeof(UnityEngine.VFX.VFXExpressionOperation), expressionName);`
	`638`	`+ var referenceExpression = VFXBuiltInExpression.Find(operation);`
	`639`	`+ Assert.IsTrue(VFXDynamicBuiltInParameter.s_BuiltInInfo.Values.Any(o => o.expression == referenceExpression));`
	`640`	`+`
	`641`	`+ }`
`631`	`642`	`}`
`632`	`643`	`}`
`633`	`644`	`#endif`