Skip to content

Commit a9c2add

Browse files
otac0notac0n
committed
Test syntax cleanup.
1 parent b36e272 commit a9c2add

3 files changed

Lines changed: 31 additions & 36 deletions

File tree

‎tests/Maths/Maths/Vector2Tests.cs‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public void Vector2CopyToTest()
2424
float[] a = new float[3];
2525
float[] b = new float[2];
2626

27-
Assert.Throws<NullReferenceException>(() => v1.CopyTo(null, 0));
2827
Assert.Throws<ArgumentOutOfRangeException>(() => v1.CopyTo(a, -1));
2928
Assert.Throws<ArgumentOutOfRangeException>(() => v1.CopyTo(a, a.Length));
3029
Assert.Throws<ArgumentException>(() => v1.CopyTo(a, 2));
@@ -628,8 +627,6 @@ public void Vector2UnaryNegationTest()
628627
Assert.True(MathHelper.Equal(expected, actual), "Vector2f.operator - did not return the expected value.");
629628
}
630629

631-
632-
633630
// A test for operator - (Vector2f)
634631
// Negate test with special float value
635632
[Fact]
@@ -845,7 +842,7 @@ public void Vector2AddTest()
845842
Vector2D<float> expected = new Vector2D<float>(6.0f, 8.0f);
846843
Vector2D<float> actual;
847844

848-
actual = Vector2D.Add(a, b);
845+
actual = a + b;
849846
Assert.Equal(expected, actual);
850847
}
851848

@@ -857,7 +854,7 @@ public void Vector2DivideTest()
857854
float div = 2.0f;
858855
Vector2D<float> expected = new Vector2D<float>(0.5f, 1.0f);
859856
Vector2D<float> actual;
860-
actual = Vector2D.Divide(a, div);
857+
actual = a / div;
861858
Assert.Equal(expected, actual);
862859
}
863860

@@ -871,7 +868,7 @@ public void Vector2DivideTest1()
871868
Vector2D<float> expected = new Vector2D<float>(1.0f / 5.0f, 6.0f / 2.0f);
872869
Vector2D<float> actual;
873870

874-
actual = Vector2D.Divide(a, b);
871+
actual = a / b;
875872
Assert.Equal(expected, actual);
876873
}
877874

@@ -941,7 +938,7 @@ public void Vector2MultiplyTest3()
941938
Vector2D<float> expected = new Vector2D<float>(5.0f, 12.0f);
942939
Vector2D<float> actual;
943940

944-
actual = Vector2D.Multiply(a, b);
941+
actual = a * b;
945942
Assert.Equal(expected, actual);
946943
}
947944

@@ -954,7 +951,7 @@ public void Vector2NegateTest()
954951
Vector2D<float> expected = new Vector2D<float>(-1.0f, -2.0f);
955952
Vector2D<float> actual;
956953

957-
actual = Vector2D.Negate(a);
954+
actual = -a;
958955
Assert.Equal(expected, actual);
959956
}
960957

@@ -1006,7 +1003,7 @@ public void Vector2SubtractTest()
10061003
Vector2D<float> expected = new Vector2D<float>(-4.0f, 4.0f);
10071004
Vector2D<float> actual;
10081005

1009-
actual = Vector2D.Subtract(a, b);
1006+
actual = a - b;
10101007
Assert.Equal(expected, actual);
10111008
}
10121009

@@ -1152,9 +1149,9 @@ public void Vector2SqrtTest()
11521149
{
11531150
Vector2D<float> v1 = new Vector2D<float>(-2.5f, 2.0f);
11541151
Vector2D<float> v2 = new Vector2D<float>(5.5f, 4.5f);
1155-
Assert.Equal(2, (int)Vector2D.SquareRoot(v2).X);
1156-
Assert.Equal(2, (int)Vector2D.SquareRoot(v2).Y);
1157-
Assert.Equal(float.NaN, Vector2D.SquareRoot(v1).X);
1152+
Assert.Equal(2, (int)Vector2D.Sqrt(v2).X);
1153+
Assert.Equal(2, (int)Vector2D.Sqrt(v2).Y);
1154+
Assert.Equal(float.NaN, Vector2D.Sqrt(v1).X);
11581155
}
11591156

11601157
// A test to make sure these types are blittable directly into GPU buffer memory layouts

‎tests/Maths/Maths/Vector3Tests.cs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public void Vector3CopyToTest()
2424
float[] a = new float[4];
2525
float[] b = new float[3];
2626

27-
Assert.Throws<NullReferenceException>(() => v1.CopyTo(null, 0));
2827
Assert.Throws<ArgumentOutOfRangeException>(() => v1.CopyTo(a, -1));
2928
Assert.Throws<ArgumentOutOfRangeException>(() => v1.CopyTo(a, a.Length));
3029
Assert.Throws<ArgumentException>(() => v1.CopyTo(a, a.Length - 2));
@@ -896,7 +895,7 @@ public void Vector3AddTest()
896895
Vector3D<float> expected = new Vector3D<float>(6.0f, 8.0f, 10.0f);
897896
Vector3D<float> actual;
898897

899-
actual = Vector3D.Add(a, b);
898+
actual = a + b;
900899
Assert.Equal(expected, actual);
901900
}
902901

@@ -908,7 +907,7 @@ public void Vector3DivideTest()
908907
float div = 2.0f;
909908
Vector3D<float> expected = new Vector3D<float>(0.5f, 1.0f, 1.5f);
910909
Vector3D<float> actual;
911-
actual = Vector3D.Divide(a, div);
910+
actual = a / div;
912911
Assert.Equal(expected, actual);
913912
}
914913

@@ -922,7 +921,7 @@ public void Vector3DivideTest1()
922921
Vector3D<float> expected = new Vector3D<float>(1.0f / 5.0f, 6.0f / 2.0f, 7.0f / 3.0f);
923922
Vector3D<float> actual;
924923

925-
actual = Vector3D.Divide(a, b);
924+
actual = a / b;
926925
Assert.Equal(expected, actual);
927926
}
928927

@@ -992,7 +991,7 @@ public void Vector3MultiplyTest3()
992991
Vector3D<float> expected = new Vector3D<float>(5.0f, 12.0f, 21.0f);
993992
Vector3D<float> actual;
994993

995-
actual = Vector3D.Multiply(a, b);
994+
actual = a * b;
996995
Assert.Equal(expected, actual);
997996
}
998997

@@ -1005,7 +1004,7 @@ public void Vector3NegateTest()
10051004
Vector3D<float> expected = new Vector3D<float>(-1.0f, -2.0f, -3.0f);
10061005
Vector3D<float> actual;
10071006

1008-
actual = Vector3D.Negate(a);
1007+
actual = -a;
10091008
Assert.Equal(expected, actual);
10101009
}
10111010

@@ -1057,7 +1056,7 @@ public void Vector3SubtractTest()
10571056
Vector3D<float> expected = new Vector3D<float>(-4.0f, 4.0f, 0.0f);
10581057
Vector3D<float> actual;
10591058

1060-
actual = Vector3D.Subtract(a, b);
1059+
actual = a - b;
10611060
Assert.Equal(expected, actual);
10621061
}
10631062

@@ -1181,10 +1180,10 @@ public void Vector3SqrtTest()
11811180
{
11821181
Vector3D<float> a = new Vector3D<float>(-2.5f, 2.0f, 0.5f);
11831182
Vector3D<float> b = new Vector3D<float>(5.5f, 4.5f, 16.5f);
1184-
Assert.Equal(2, (int)Vector3D.SquareRoot(b).X);
1185-
Assert.Equal(2, (int)Vector3D.SquareRoot(b).Y);
1186-
Assert.Equal(4, (int)Vector3D.SquareRoot(b).Z);
1187-
Assert.Equal(float.NaN, Vector3D.SquareRoot(a).X);
1183+
Assert.Equal(2, (int)Vector3D.Sqrt(b).X);
1184+
Assert.Equal(2, (int)Vector3D.Sqrt(b).Y);
1185+
Assert.Equal(4, (int)Vector3D.Sqrt(b).Z);
1186+
Assert.Equal(float.NaN, Vector3D.Sqrt(a).X);
11881187
}
11891188

11901189
// A test to make sure these types are blittable directly into GPU buffer memory layouts

‎tests/Maths/Maths/Vector4Tests.cs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public void Vector4CopyToTest()
2424
float[] a = new float[5];
2525
float[] b = new float[4];
2626

27-
Assert.Throws<NullReferenceException>(() => v1.CopyTo(null, 0));
2827
Assert.Throws<ArgumentOutOfRangeException>(() => v1.CopyTo(a, -1));
2928
Assert.Throws<ArgumentOutOfRangeException>(() => v1.CopyTo(a, a.Length));
3029
Assert.Throws<ArgumentException>(() => v1.CopyTo(a, a.Length - 2));
@@ -1111,7 +1110,7 @@ public void Vector4AddTest()
11111110
Vector4D<float> expected = new Vector4D<float>(6.0f, 8.0f, 10.0f, 12.0f);
11121111
Vector4D<float> actual;
11131112

1114-
actual = Vector4D.Add(a, b);
1113+
actual = a + b;
11151114
Assert.Equal(expected, actual);
11161115
}
11171116

@@ -1123,7 +1122,7 @@ public void Vector4DivideTest()
11231122
float div = 2.0f;
11241123
Vector4D<float> expected = new Vector4D<float>(0.5f, 1.0f, 1.5f, 2.0f);
11251124
Vector4D<float> actual;
1126-
actual = Vector4D.Divide(a, div);
1125+
actual = a / div;
11271126
Assert.Equal(expected, actual);
11281127
}
11291128

@@ -1137,7 +1136,7 @@ public void Vector4DivideTest1()
11371136
Vector4D<float> expected = new Vector4D<float>(1.0f / 5.0f, 6.0f / 2.0f, 7.0f / 3.0f, 4.0f / 8.0f);
11381137
Vector4D<float> actual;
11391138

1140-
actual = Vector4D.Divide(a, b);
1139+
actual = a / b;
11411140
Assert.Equal(expected, actual);
11421141
}
11431142

@@ -1182,7 +1181,7 @@ public void Vector4MultiplyTest()
11821181
Vector4D<float> a = new Vector4D<float>(1.0f, 2.0f, 3.0f, 4.0f);
11831182
const float factor = 2.0f;
11841183
Vector4D<float> expected = new Vector4D<float>(2.0f, 4.0f, 6.0f, 8.0f);
1185-
Vector4D<float> actual = Vector4D.Multiply(factor, a);
1184+
Vector4D<float> actual = factor * a;
11861185
Assert.Equal(expected, actual);
11871186
}
11881187

@@ -1207,7 +1206,7 @@ public void Vector4MultiplyTest3()
12071206
Vector4D<float> expected = new Vector4D<float>(5.0f, 12.0f, 21.0f, 32.0f);
12081207
Vector4D<float> actual;
12091208

1210-
actual = Vector4D.Multiply(a, b);
1209+
actual = a * b;
12111210
Assert.Equal(expected, actual);
12121211
}
12131212

@@ -1220,7 +1219,7 @@ public void Vector4NegateTest()
12201219
Vector4D<float> expected = new Vector4D<float>(-1.0f, -2.0f, -3.0f, -4.0f);
12211220
Vector4D<float> actual;
12221221

1223-
actual = Vector4D.Negate(a);
1222+
actual = -a;
12241223
Assert.Equal(expected, actual);
12251224
}
12261225

@@ -1272,7 +1271,7 @@ public void Vector4SubtractTest()
12721271
Vector4D<float> expected = new Vector4D<float>(-4.0f, 4.0f, 0.0f, -5.0f);
12731272
Vector4D<float> actual;
12741273

1275-
actual = Vector4D.Subtract(a, b);
1274+
actual = a - b;
12761275

12771276
Assert.Equal(expected, actual);
12781277
}
@@ -1408,11 +1407,11 @@ public void Vector4SqrtTest()
14081407
{
14091408
Vector4D<float> v1 = new Vector4D<float>(-2.5f, 2.0f, 3.0f, 3.3f);
14101409
Vector4D<float> v2 = new Vector4D<float>(5.5f, 4.5f, 6.5f, 7.5f);
1411-
Assert.Equal(2, (int)Vector4D.SquareRoot(v2).X);
1412-
Assert.Equal(2, (int)Vector4D.SquareRoot(v2).Y);
1413-
Assert.Equal(2, (int)Vector4D.SquareRoot(v2).Z);
1414-
Assert.Equal(2, (int)Vector4D.SquareRoot(v2).W);
1415-
Assert.Equal(float.NaN, Vector4D.SquareRoot(v1).X);
1410+
Assert.Equal(2, (int)Vector4D.Sqrt(v2).X);
1411+
Assert.Equal(2, (int)Vector4D.Sqrt(v2).Y);
1412+
Assert.Equal(2, (int)Vector4D.Sqrt(v2).Z);
1413+
Assert.Equal(2, (int)Vector4D.Sqrt(v2).W);
1414+
Assert.Equal(float.NaN, Vector4D.Sqrt(v1).X);
14161415
}
14171416

14181417
// A test to make sure these types are blittable directly into GPU buffer memory layouts

0 commit comments

Comments
 (0)