From cc316c60ebc1f2aa74cdc881e62bceef18c09fee Mon Sep 17 00:00:00 2001 From: Aashik Harish Date: Sat, 24 Aug 2019 14:37:29 -0700 Subject: [PATCH] System.Numeric.Tests tests now have unique inputs Matrix add, subtract and multiplication tests now have unique inputs --- .../tests/Matrix3x2Tests.cs | 80 +++++++++------- .../tests/Matrix4x4Tests.cs | 92 +++++++++---------- 2 files changed, 92 insertions(+), 80 deletions(-) diff --git a/src/System.Numerics.Vectors/tests/Matrix3x2Tests.cs b/src/System.Numerics.Vectors/tests/Matrix3x2Tests.cs index 040a81a9c67d..c2a128fcaafc 100644 --- a/src/System.Numerics.Vectors/tests/Matrix3x2Tests.cs +++ b/src/System.Numerics.Vectors/tests/Matrix3x2Tests.cs @@ -9,15 +9,15 @@ namespace System.Numerics.Tests { public class Matrix3x2Tests { - static Matrix3x2 GenerateMatrixNumberFrom1To6() + static Matrix3x2 GenerateIncrementalMatrixNumber(float value = 0.0f) { Matrix3x2 a = new Matrix3x2(); - a.M11 = 1.0f; - a.M12 = 2.0f; - a.M21 = 3.0f; - a.M22 = 4.0f; - a.M31 = 5.0f; - a.M32 = 6.0f; + a.M11 = value + 1.0f; + a.M12 = value + 2.0f; + a.M21 = value + 3.0f; + a.M22 = value + 4.0f; + a.M31 = value + 5.0f; + a.M32 = value + 6.0f; return a; } @@ -314,7 +314,7 @@ public void Matrix3x2LerpTest() a.M31 = 31.0f; a.M32 = 32.0f; - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(); float t = 0.5f; @@ -337,7 +337,7 @@ public void Matrix3x2LerpTest() [Fact] public void Matrix3x2UnaryNegationTest() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); Matrix3x2 expected = new Matrix3x2(); expected.M11 = -1.0f; @@ -355,9 +355,15 @@ public void Matrix3x2UnaryNegationTest() [Fact] public void Matrix3x2SubtractionTest() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f); Matrix3x2 expected = new Matrix3x2(); + expected.M11 = a.M11 - b.M11; + expected.M12 = a.M12 - b.M12; + expected.M21 = a.M21 - b.M21; + expected.M22 = a.M22 - b.M22; + expected.M31 = a.M31 - b.M31; + expected.M32 = a.M32 - b.M32; Matrix3x2 actual = a - b; Assert.True(MathHelper.Equal(expected, actual), "Matrix3x2.operator - did not return the expected value."); @@ -367,8 +373,8 @@ public void Matrix3x2SubtractionTest() [Fact] public void Matrix3x2MultiplyTest1() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f); Matrix3x2 expected = new Matrix3x2(); expected.M11 = a.M11 * b.M11 + a.M12 * b.M21; @@ -423,8 +429,8 @@ public void Matrix3x2MultiplyTest4() [Fact] public void Matrix3x2AdditionTest() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f); Matrix3x2 expected = new Matrix3x2(); expected.M11 = a.M11 + b.M11; @@ -466,8 +472,8 @@ public void Matrix3x2ToStringTest() [Fact] public void Matrix3x2AddTest() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f); Matrix3x2 expected = new Matrix3x2(); expected.M11 = a.M11 + b.M11; @@ -487,8 +493,8 @@ public void Matrix3x2AddTest() [Fact] public void Matrix3x2EqualsTest() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(); // case 1: compare between same values object obj = b; @@ -521,7 +527,7 @@ public void Matrix3x2EqualsTest() [Fact] public void Matrix3x2GetHashCodeTest() { - Matrix3x2 target = GenerateMatrixNumberFrom1To6(); + Matrix3x2 target = GenerateIncrementalMatrixNumber(); int expected = unchecked(target.M11.GetHashCode() + target.M12.GetHashCode() + target.M21.GetHashCode() + target.M22.GetHashCode() + target.M31.GetHashCode() + target.M32.GetHashCode()); @@ -535,8 +541,8 @@ public void Matrix3x2GetHashCodeTest() [Fact] public void Matrix3x2MultiplyTest3() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f); Matrix3x2 expected = new Matrix3x2(); expected.M11 = a.M11 * b.M11 + a.M12 * b.M21; @@ -570,7 +576,7 @@ public void Matrix3x2MultiplyTest3() [Fact] public void Matrix3x2MultiplyTest5() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); Matrix3x2 expected = new Matrix3x2(3, 6, 9, 12, 15, 18); Matrix3x2 actual = Matrix3x2.Multiply(a, 3); @@ -581,7 +587,7 @@ public void Matrix3x2MultiplyTest5() [Fact] public void Matrix3x2MultiplyTest6() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); Matrix3x2 expected = new Matrix3x2(3, 6, 9, 12, 15, 18); Matrix3x2 actual = a * 3; @@ -592,7 +598,7 @@ public void Matrix3x2MultiplyTest6() [Fact] public void Matrix3x2NegateTest() { - Matrix3x2 m = GenerateMatrixNumberFrom1To6(); + Matrix3x2 m = GenerateIncrementalMatrixNumber(); Matrix3x2 expected = new Matrix3x2(); expected.M11 = -1.0f; @@ -611,8 +617,8 @@ public void Matrix3x2NegateTest() [Fact] public void Matrix3x2InequalityTest() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(); // case 1: compare between same values bool expected = false; @@ -630,8 +636,8 @@ public void Matrix3x2InequalityTest() [Fact] public void Matrix3x2EqualityTest() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(); // case 1: compare between same values bool expected = true; @@ -649,11 +655,17 @@ public void Matrix3x2EqualityTest() [Fact] public void Matrix3x2SubtractTest() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f); Matrix3x2 expected = new Matrix3x2(); - Matrix3x2 actual; + expected.M11 = a.M11 - b.M11; + expected.M12 = a.M12 - b.M12; + expected.M21 = a.M21 - b.M21; + expected.M22 = a.M22 - b.M22; + expected.M31 = a.M31 - b.M31; + expected.M32 = a.M32 - b.M32; + Matrix3x2 actual; actual = Matrix3x2.Subtract(a, b); Assert.Equal(expected, actual); } @@ -804,8 +816,8 @@ public void Matrix3x2TranslationTest() [Fact] public void Matrix3x2EqualsTest1() { - Matrix3x2 a = GenerateMatrixNumberFrom1To6(); - Matrix3x2 b = GenerateMatrixNumberFrom1To6(); + Matrix3x2 a = GenerateIncrementalMatrixNumber(); + Matrix3x2 b = GenerateIncrementalMatrixNumber(); // case 1: compare between same values bool expected = true; diff --git a/src/System.Numerics.Vectors/tests/Matrix4x4Tests.cs b/src/System.Numerics.Vectors/tests/Matrix4x4Tests.cs index 9d036b1c05ac..4c6fa0c0637d 100644 --- a/src/System.Numerics.Vectors/tests/Matrix4x4Tests.cs +++ b/src/System.Numerics.Vectors/tests/Matrix4x4Tests.cs @@ -10,25 +10,25 @@ namespace System.Numerics.Tests { public class Matrix4x4Tests { - static Matrix4x4 GenerateMatrixNumberFrom1To16() + static Matrix4x4 GenerateIncrementalMatrixNumber(float value = 0.0f) { Matrix4x4 a = new Matrix4x4(); - a.M11 = 1.0f; - a.M12 = 2.0f; - a.M13 = 3.0f; - a.M14 = 4.0f; - a.M21 = 5.0f; - a.M22 = 6.0f; - a.M23 = 7.0f; - a.M24 = 8.0f; - a.M31 = 9.0f; - a.M32 = 10.0f; - a.M33 = 11.0f; - a.M34 = 12.0f; - a.M41 = 13.0f; - a.M42 = 14.0f; - a.M43 = 15.0f; - a.M44 = 16.0f; + a.M11 = value + 1.0f; + a.M12 = value + 2.0f; + a.M13 = value + 3.0f; + a.M14 = value + 4.0f; + a.M21 = value + 5.0f; + a.M22 = value + 6.0f; + a.M23 = value + 7.0f; + a.M24 = value + 8.0f; + a.M31 = value + 9.0f; + a.M32 = value + 10.0f; + a.M33 = value + 11.0f; + a.M34 = value + 12.0f; + a.M41 = value + 13.0f; + a.M42 = value + 14.0f; + a.M43 = value + 15.0f; + a.M44 = value + 16.0f; return a; } @@ -353,7 +353,7 @@ public void Matrix4x4DecomposeTest04() Quaternion rotation; Vector3 translation; - Assert.False(Matrix4x4.Decompose(GenerateMatrixNumberFrom1To16(), out scales, out rotation, out translation), "decompose should have failed."); + Assert.False(Matrix4x4.Decompose(GenerateIncrementalMatrixNumber(), out scales, out rotation, out translation), "decompose should have failed."); Assert.False(Matrix4x4.Decompose(new Matrix4x4(Matrix3x2.CreateSkew(1, 2)), out scales, out rotation, out translation), "decompose should have failed."); } @@ -361,7 +361,7 @@ public void Matrix4x4DecomposeTest04() [Fact] public void Matrix4x4TransformTest() { - Matrix4x4 target = GenerateMatrixNumberFrom1To16(); + Matrix4x4 target = GenerateIncrementalMatrixNumber(); Matrix4x4 m = Matrix4x4.CreateRotationX(MathHelper.ToRadians(30.0f)) * @@ -1142,7 +1142,7 @@ public void Matrix4x4LerpTest() a.M43 = 43.0f; a.M44 = 44.0f; - Matrix4x4 b = GenerateMatrixNumberFrom1To16(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(); float t = 0.5f; @@ -1176,7 +1176,7 @@ public void Matrix4x4LerpTest() [Fact] public void Matrix4x4UnaryNegationTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); Matrix4x4 expected = new Matrix4x4(); expected.M11 = -1.0f; @@ -1204,8 +1204,8 @@ public void Matrix4x4UnaryNegationTest() [Fact] public void Matrix4x4SubtractionTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = new Matrix4x4(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(-8.0f); Matrix4x4 expected = new Matrix4x4(); expected.M11 = a.M11 - b.M11; @@ -1233,8 +1233,8 @@ public void Matrix4x4SubtractionTest() [Fact] public void Matrix4x4MultiplyTest1() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(-8.0f); Matrix4x4 expected = new Matrix4x4(); expected.M11 = a.M11 * b.M11 + a.M12 * b.M21 + a.M13 * b.M31 + a.M14 * b.M41; @@ -1297,8 +1297,8 @@ public void Matrix4x4MultiplyTest4() [Fact] public void Matrix4x4AdditionTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = new Matrix4x4(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(-8.0f); Matrix4x4 expected = new Matrix4x4(); expected.M11 = a.M11 + b.M11; @@ -1326,7 +1326,7 @@ public void Matrix4x4AdditionTest() [Fact] public void Matrix4x4TransposeTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); Matrix4x4 expected = new Matrix4x4(); expected.M11 = a.M11; @@ -1529,8 +1529,8 @@ public void Matrix4x4ToStringTest() [Fact] public void Matrix4x4AddTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = new Matrix4x4(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(-8.0f); Matrix4x4 expected = new Matrix4x4(); expected.M11 = a.M11 + b.M11; @@ -1558,8 +1558,8 @@ public void Matrix4x4AddTest() [Fact] public void Matrix4x4EqualsTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(); // case 1: compare between same values object obj = b; @@ -1592,7 +1592,7 @@ public void Matrix4x4EqualsTest() [Fact] public void Matrix4x4GetHashCodeTest() { - Matrix4x4 target = GenerateMatrixNumberFrom1To16(); + Matrix4x4 target = GenerateIncrementalMatrixNumber(); int expected = unchecked( target.M11.GetHashCode() + target.M12.GetHashCode() + target.M13.GetHashCode() + target.M14.GetHashCode() + target.M21.GetHashCode() + target.M22.GetHashCode() + target.M23.GetHashCode() + target.M24.GetHashCode() + @@ -1608,8 +1608,8 @@ public void Matrix4x4GetHashCodeTest() [Fact] public void Matrix4x4MultiplyTest3() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(-8.0f); Matrix4x4 expected = new Matrix4x4(); expected.M11 = a.M11 * b.M11 + a.M12 * b.M21 + a.M13 * b.M31 + a.M14 * b.M41; @@ -1641,7 +1641,7 @@ public void Matrix4x4MultiplyTest3() [Fact] public void Matrix4x4MultiplyTest5() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); Matrix4x4 expected = new Matrix4x4(3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48); Matrix4x4 actual = Matrix4x4.Multiply(a, 3); @@ -1652,7 +1652,7 @@ public void Matrix4x4MultiplyTest5() [Fact] public void Matrix4x4MultiplyTest6() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); Matrix4x4 expected = new Matrix4x4(3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48); Matrix4x4 actual = a * 3; @@ -1663,7 +1663,7 @@ public void Matrix4x4MultiplyTest6() [Fact] public void Matrix4x4NegateTest() { - Matrix4x4 m = GenerateMatrixNumberFrom1To16(); + Matrix4x4 m = GenerateIncrementalMatrixNumber(); Matrix4x4 expected = new Matrix4x4(); expected.M11 = -1.0f; @@ -1692,8 +1692,8 @@ public void Matrix4x4NegateTest() [Fact] public void Matrix4x4InequalityTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(); // case 1: compare between same values bool expected = false; @@ -1711,8 +1711,8 @@ public void Matrix4x4InequalityTest() [Fact] public void Matrix4x4EqualityTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(); // case 1: compare between same values bool expected = true; @@ -1730,8 +1730,8 @@ public void Matrix4x4EqualityTest() [Fact] public void Matrix4x4SubtractTest() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = new Matrix4x4(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(-8.0f); Matrix4x4 expected = new Matrix4x4(); expected.M11 = a.M11 - b.M11; @@ -2307,8 +2307,8 @@ public void Matrix4x4TranslationTest() [Fact] public void Matrix4x4EqualsTest1() { - Matrix4x4 a = GenerateMatrixNumberFrom1To16(); - Matrix4x4 b = GenerateMatrixNumberFrom1To16(); + Matrix4x4 a = GenerateIncrementalMatrixNumber(); + Matrix4x4 b = GenerateIncrementalMatrixNumber(); // case 1: compare between same values bool expected = true;