Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit cadc61e

Browse files
aashikgowdastephentoub
aashikgowda
authored and
stephentoub
committed
System.Numeric.Tests tests now have unique inputs (#40564)
Matrix add, subtract and multiplication tests now have unique inputs
1 parent 8038032 commit cadc61e

File tree

2 files changed

+92
-80
lines changed

2 files changed

+92
-80
lines changed

‎src/System.Numerics.Vectors/tests/Matrix3x2Tests.cs‎

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ namespace System.Numerics.Tests
99
{
1010
public class Matrix3x2Tests
1111
{
12-
static Matrix3x2 GenerateMatrixNumberFrom1To6()
12+
static Matrix3x2 GenerateIncrementalMatrixNumber(float value = 0.0f)
1313
{
1414
Matrix3x2 a = new Matrix3x2();
15-
a.M11 = 1.0f;
16-
a.M12 = 2.0f;
17-
a.M21 = 3.0f;
18-
a.M22 = 4.0f;
19-
a.M31 = 5.0f;
20-
a.M32 = 6.0f;
15+
a.M11 = value + 1.0f;
16+
a.M12 = value + 2.0f;
17+
a.M21 = value + 3.0f;
18+
a.M22 = value + 4.0f;
19+
a.M31 = value + 5.0f;
20+
a.M32 = value + 6.0f;
2121
return a;
2222
}
2323

@@ -314,7 +314,7 @@ public void Matrix3x2LerpTest()
314314
a.M31 = 31.0f;
315315
a.M32 = 32.0f;
316316

317-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
317+
Matrix3x2 b = GenerateIncrementalMatrixNumber();
318318

319319
float t = 0.5f;
320320

@@ -337,7 +337,7 @@ public void Matrix3x2LerpTest()
337337
[Fact]
338338
public void Matrix3x2UnaryNegationTest()
339339
{
340-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
340+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
341341

342342
Matrix3x2 expected = new Matrix3x2();
343343
expected.M11 = -1.0f;
@@ -355,9 +355,15 @@ public void Matrix3x2UnaryNegationTest()
355355
[Fact]
356356
public void Matrix3x2SubtractionTest()
357357
{
358-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
359-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
358+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
359+
Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f);
360360
Matrix3x2 expected = new Matrix3x2();
361+
expected.M11 = a.M11 - b.M11;
362+
expected.M12 = a.M12 - b.M12;
363+
expected.M21 = a.M21 - b.M21;
364+
expected.M22 = a.M22 - b.M22;
365+
expected.M31 = a.M31 - b.M31;
366+
expected.M32 = a.M32 - b.M32;
361367

362368
Matrix3x2 actual = a - b;
363369
Assert.True(MathHelper.Equal(expected, actual), "Matrix3x2.operator - did not return the expected value.");
@@ -367,8 +373,8 @@ public void Matrix3x2SubtractionTest()
367373
[Fact]
368374
public void Matrix3x2MultiplyTest1()
369375
{
370-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
371-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
376+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
377+
Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f);
372378

373379
Matrix3x2 expected = new Matrix3x2();
374380
expected.M11 = a.M11 * b.M11 + a.M12 * b.M21;
@@ -423,8 +429,8 @@ public void Matrix3x2MultiplyTest4()
423429
[Fact]
424430
public void Matrix3x2AdditionTest()
425431
{
426-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
427-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
432+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
433+
Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f);
428434

429435
Matrix3x2 expected = new Matrix3x2();
430436
expected.M11 = a.M11 + b.M11;
@@ -466,8 +472,8 @@ public void Matrix3x2ToStringTest()
466472
[Fact]
467473
public void Matrix3x2AddTest()
468474
{
469-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
470-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
475+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
476+
Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f);
471477

472478
Matrix3x2 expected = new Matrix3x2();
473479
expected.M11 = a.M11 + b.M11;
@@ -487,8 +493,8 @@ public void Matrix3x2AddTest()
487493
[Fact]
488494
public void Matrix3x2EqualsTest()
489495
{
490-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
491-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
496+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
497+
Matrix3x2 b = GenerateIncrementalMatrixNumber();
492498

493499
// case 1: compare between same values
494500
object obj = b;
@@ -521,7 +527,7 @@ public void Matrix3x2EqualsTest()
521527
[Fact]
522528
public void Matrix3x2GetHashCodeTest()
523529
{
524-
Matrix3x2 target = GenerateMatrixNumberFrom1To6();
530+
Matrix3x2 target = GenerateIncrementalMatrixNumber();
525531
int expected = unchecked(target.M11.GetHashCode() + target.M12.GetHashCode() +
526532
target.M21.GetHashCode() + target.M22.GetHashCode() +
527533
target.M31.GetHashCode() + target.M32.GetHashCode());
@@ -535,8 +541,8 @@ public void Matrix3x2GetHashCodeTest()
535541
[Fact]
536542
public void Matrix3x2MultiplyTest3()
537543
{
538-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
539-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
544+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
545+
Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f);
540546

541547
Matrix3x2 expected = new Matrix3x2();
542548
expected.M11 = a.M11 * b.M11 + a.M12 * b.M21;
@@ -570,7 +576,7 @@ public void Matrix3x2MultiplyTest3()
570576
[Fact]
571577
public void Matrix3x2MultiplyTest5()
572578
{
573-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
579+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
574580
Matrix3x2 expected = new Matrix3x2(3, 6, 9, 12, 15, 18);
575581
Matrix3x2 actual = Matrix3x2.Multiply(a, 3);
576582

@@ -581,7 +587,7 @@ public void Matrix3x2MultiplyTest5()
581587
[Fact]
582588
public void Matrix3x2MultiplyTest6()
583589
{
584-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
590+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
585591
Matrix3x2 expected = new Matrix3x2(3, 6, 9, 12, 15, 18);
586592
Matrix3x2 actual = a * 3;
587593

@@ -592,7 +598,7 @@ public void Matrix3x2MultiplyTest6()
592598
[Fact]
593599
public void Matrix3x2NegateTest()
594600
{
595-
Matrix3x2 m = GenerateMatrixNumberFrom1To6();
601+
Matrix3x2 m = GenerateIncrementalMatrixNumber();
596602

597603
Matrix3x2 expected = new Matrix3x2();
598604
expected.M11 = -1.0f;
@@ -611,8 +617,8 @@ public void Matrix3x2NegateTest()
611617
[Fact]
612618
public void Matrix3x2InequalityTest()
613619
{
614-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
615-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
620+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
621+
Matrix3x2 b = GenerateIncrementalMatrixNumber();
616622

617623
// case 1: compare between same values
618624
bool expected = false;
@@ -630,8 +636,8 @@ public void Matrix3x2InequalityTest()
630636
[Fact]
631637
public void Matrix3x2EqualityTest()
632638
{
633-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
634-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
639+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
640+
Matrix3x2 b = GenerateIncrementalMatrixNumber();
635641

636642
// case 1: compare between same values
637643
bool expected = true;
@@ -649,11 +655,17 @@ public void Matrix3x2EqualityTest()
649655
[Fact]
650656
public void Matrix3x2SubtractTest()
651657
{
652-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
653-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
658+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
659+
Matrix3x2 b = GenerateIncrementalMatrixNumber(-3.0f);
654660
Matrix3x2 expected = new Matrix3x2();
655-
Matrix3x2 actual;
661+
expected.M11 = a.M11 - b.M11;
662+
expected.M12 = a.M12 - b.M12;
663+
expected.M21 = a.M21 - b.M21;
664+
expected.M22 = a.M22 - b.M22;
665+
expected.M31 = a.M31 - b.M31;
666+
expected.M32 = a.M32 - b.M32;
656667

668+
Matrix3x2 actual;
657669
actual = Matrix3x2.Subtract(a, b);
658670
Assert.Equal(expected, actual);
659671
}
@@ -804,8 +816,8 @@ public void Matrix3x2TranslationTest()
804816
[Fact]
805817
public void Matrix3x2EqualsTest1()
806818
{
807-
Matrix3x2 a = GenerateMatrixNumberFrom1To6();
808-
Matrix3x2 b = GenerateMatrixNumberFrom1To6();
819+
Matrix3x2 a = GenerateIncrementalMatrixNumber();
820+
Matrix3x2 b = GenerateIncrementalMatrixNumber();
809821

810822
// case 1: compare between same values
811823
bool expected = true;

0 commit comments

Comments
 (0)