eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename some matrix tests

Browse source
This commit is contained in:
Eryn Wells 2014-08-10 11:39:05 -07:00
parent 620d5a5bc6
commit 51fbba95e7
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/test_basics.cc
View file

@ -248,7 +248,7 @@ TEST_F(Matrix4Test, ScalarMultiplication)
} }
TEST_F(Matrix4Test, SquareMatrixMultiplication) TEST_F(Matrix4Test, MatrixMatrixMultiplication)
{ {
const Double p1Expect[] = {1045, 1690, 2735, 4425, const Double p1Expect[] = {1045, 1690, 2735, 4425,
2137, 3454, 5591, 9045, 2137, 3454, 5591, 9045,
@ -267,20 +267,10 @@ TEST_F(Matrix4Test, SquareMatrixMultiplication)
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {
EXPECT_EQ(p2.CArray()[i], p2Expect[i]); EXPECT_EQ(p2.CArray()[i], p2Expect[i]);
} }
/* Multiplication with the identity matrix produces the same matrix. */
Matrix4 p3 = m1 * Matrix4::Identity();
for (int i = 0; i < 16; i++) {
EXPECT_EQ(p3.CArray()[i], m1.CArray()[i]);
}
Matrix4 p4 = Matrix4::Identity() * m1;
for (int i = 0; i < 16; i++) {
EXPECT_EQ(p4.CArray()[i], m1.CArray()[i]);
}
} }
TEST_F(Matrix4Test, IdentityMultiplication) TEST_F(Matrix4Test, MatrixIdentityMultiplication)
{ {
Matrix4 p1 = m1 * id; Matrix4 p1 = m1 * id;
for (UInt i = 0; i < 16; i++) { for (UInt i = 0; i < 16; i++) {
@ -294,7 +284,7 @@ TEST_F(Matrix4Test, IdentityMultiplication)
} }
TEST_F(Matrix4Test, VectorMultiplication) TEST_F(Matrix4Test, IdentityVectorMultiplication)
{ {
Vector4 v1(1, 2, 3); Vector4 v1(1, 2, 3);