Skip to content

Commit a4c7bf3

Browse files
PaulDemeulenaereGitHub Enterprise
authored andcommitted
[Test] Enable test to cover properly reset override behavior (#80)
* Renable test to cover issue 1206890 * Fix newly introduced test : Exepcted value is original after reset override & handle correctly color
1 parent f73d36d commit a4c7bf3

File tree

1 file changed

+21
-25
lines changed

1 file changed

+21
-25
lines changed

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

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,32 +1285,28 @@ public IEnumerator CreateComponentWithAllBasicTypeExposed([ValueSource("trueOrFa
12851285
var currentName = commonBaseName + parameter.model.type.UserFriendlyName();
12861286
vfxComponent.ResetOverride(currentName);
12871287

1288+
var baseValue = GetValue_A_Type(parameter.model.type);
1289+
object currentValue = null;
1290+
if (bindingModes)
1291+
currentValue = fnGet_UsingBindings(type, vfxComponent, currentName);
1292+
else
1293+
currentValue = fnGet_UsingSerializedProperty(type, vfxComponent, currentName);
1294+
if (type == VFXValueType.ColorGradient)
12881295
{
1289-
#if CASE_1206890_HAS_BEEN_FIXED
1290-
var baseValue = GetValue_B_Type(parameter.model.type);
1291-
object currentValue = null;
1292-
if (bindingModes)
1293-
currentValue = fnGet_UsingBindings(type, vfxComponent, currentName);
1294-
else
1295-
currentValue = fnGet_UsingSerializedProperty(type, vfxComponent, currentName);
1296-
if (type == VFXValueType.ColorGradient)
1297-
{
1298-
Assert.IsTrue(fnCompareGradient((Gradient)baseValue, (Gradient)currentValue));
1299-
}
1300-
else if (type == VFXValueType.Curve)
1301-
{
1302-
Assert.IsTrue(fnCompareCurve((AnimationCurve)baseValue, (AnimationCurve)currentValue));
1303-
}
1304-
else if (bindingModes && parameter.model.type == typeof(Color))
1305-
{
1306-
Color col = (Color)baseValue;
1307-
Assert.AreEqual(new Vector4(col.r, col.g, col.b, col.a), currentValue);
1308-
}
1309-
else
1310-
{
1311-
Assert.AreEqual(baseValue, currentValue);
1312-
}
1313-
#endif
1296+
Assert.IsTrue(fnCompareGradient((Gradient)baseValue, (Gradient)currentValue));
1297+
}
1298+
else if (type == VFXValueType.Curve)
1299+
{
1300+
Assert.IsTrue(fnCompareCurve((AnimationCurve)baseValue, (AnimationCurve)currentValue));
1301+
}
1302+
else if (parameter.model.type == typeof(Color))
1303+
{
1304+
Color col = (Color)baseValue;
1305+
Assert.AreEqual(new Vector4(col.r, col.g, col.b, col.a), currentValue);
1306+
}
1307+
else
1308+
{
1309+
Assert.AreEqual(baseValue, currentValue);
13141310
}
13151311

13161312
if (!bindingModes)

0 commit comments

Comments
 (0)