Changed: Using EXPECT_FLOAT_EQ(a,b) instead of EXPECT_TRUE(a==b).

Then it is easier to see what is wrong, when something is wrong..
This commit is contained in:
Knut Morten Okstad 2017-04-26 13:40:11 +02:00
parent 5bf21a54f8
commit 21eb5a7bc3
2 changed files with 41 additions and 41 deletions

View File

@ -22,14 +22,14 @@ TEST(TestTensor, Multiply)
const double data[9] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0 };
Tensor T2 = 2.0*Tensor(std::vector<double>(data,data+4));
ASSERT_TRUE(T2.dim() == 2);
ASSERT_EQ(T2.dim(), 2U);
ASSERT_FLOAT_EQ(T2(1,1), 2.0);
ASSERT_FLOAT_EQ(T2(2,1), 4.0);
ASSERT_FLOAT_EQ(T2(1,2), 6.0);
ASSERT_FLOAT_EQ(T2(2,2), 8.0);
Tensor T3 = 0.5*Tensor(std::vector<double>(data,data+9));
ASSERT_TRUE(T3.dim() == 3);
ASSERT_EQ(T3.dim(), 3U);
ASSERT_FLOAT_EQ(T3(1,1), 0.5);
ASSERT_FLOAT_EQ(T3(2,1), 1.0);
ASSERT_FLOAT_EQ(T3(3,1), 1.5);
@ -41,7 +41,7 @@ TEST(TestTensor, Multiply)
ASSERT_FLOAT_EQ(T3(3,3), 4.5);
Tensor T = T2*T3;
ASSERT_TRUE(T.dim() == 2);
ASSERT_EQ(T.dim(), 2U);
ASSERT_FLOAT_EQ(T(1,1), 7.0);
ASSERT_FLOAT_EQ(T(2,1), 10.0);
ASSERT_FLOAT_EQ(T(1,2), 19.0);

View File

@ -18,33 +18,33 @@
TEST(TestVec3Oper, GetAndSet)
{
Vec3 a(1.0,2.0,3.0);
EXPECT_TRUE(a[0] == 1.0);
EXPECT_TRUE(a[1] == 2.0);
EXPECT_TRUE(a[2] == 3.0);
EXPECT_TRUE(a(1) == 1.0);
EXPECT_TRUE(a(2) == 2.0);
EXPECT_TRUE(a(3) == 3.0);
EXPECT_TRUE(a.x == 1.0);
EXPECT_TRUE(a.y == 2.0);
EXPECT_TRUE(a.z == 3.0);
EXPECT_FLOAT_EQ(a[0], 1.0);
EXPECT_FLOAT_EQ(a[1], 2.0);
EXPECT_FLOAT_EQ(a[2], 3.0);
EXPECT_FLOAT_EQ(a(1), 1.0);
EXPECT_FLOAT_EQ(a(2), 2.0);
EXPECT_FLOAT_EQ(a(3), 3.0);
EXPECT_FLOAT_EQ(a.x , 1.0);
EXPECT_FLOAT_EQ(a.y , 2.0);
EXPECT_FLOAT_EQ(a.z , 3.0);
a[0] = 4.0;
a(2) = 5.0;
a.z = 6.0;
EXPECT_TRUE(a[0] == 4.0);
EXPECT_TRUE(a[1] == 5.0);
EXPECT_TRUE(a[2] == 6.0);
EXPECT_FLOAT_EQ(a[0], 4.0);
EXPECT_FLOAT_EQ(a[1], 5.0);
EXPECT_FLOAT_EQ(a[2], 6.0);
}
TEST(TestVec3Oper, MxV)
{
utl::matrix<Real> A(3,3);
A.fill(std::vector<Real>({1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0}).data());
std::vector<Real> x({1.0,2.0,3.0});
const double data[9] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0 };
utl::matrix<Real> A(3,3); A.fill(data);
std::vector<Real> x(data, data+3);
Vec3 result = A * x;
EXPECT_TRUE(result.x == 30.0);
EXPECT_TRUE(result.y == 36.0);
EXPECT_TRUE(result.z == 42.0);
EXPECT_FLOAT_EQ(result.x, 30.0);
EXPECT_FLOAT_EQ(result.y, 36.0);
EXPECT_FLOAT_EQ(result.z, 42.0);
}
TEST(TestVec3Oper, MultiplyScalar)
@ -54,9 +54,9 @@ TEST(TestVec3Oper, MultiplyScalar)
Vec3 result2 = 10.0*a;
EXPECT_TRUE(result == result2);
EXPECT_TRUE(result.x == 10.0);
EXPECT_TRUE(result.y == 20.0);
EXPECT_TRUE(result.z == 30.0);
EXPECT_FLOAT_EQ(result.x, 10.0);
EXPECT_FLOAT_EQ(result.y, 20.0);
EXPECT_FLOAT_EQ(result.z, 30.0);
}
TEST(TestVec3Oper, DivideScalar)
@ -64,9 +64,9 @@ TEST(TestVec3Oper, DivideScalar)
Vec3 a(1.0,2.0,3.0);
Vec3 result = a/10.0;
EXPECT_TRUE(result.x == 0.1);
EXPECT_TRUE(result.y == 0.2);
EXPECT_TRUE(result.z == 0.3);
EXPECT_FLOAT_EQ(result.x, 0.1);
EXPECT_FLOAT_EQ(result.y, 0.2);
EXPECT_FLOAT_EQ(result.z, 0.3);
}
TEST(TestVec3Oper, Dot)
@ -75,7 +75,7 @@ TEST(TestVec3Oper, Dot)
Vec3 b(4.0,5.0,6.0);
Real result = a * b;
EXPECT_TRUE(result == 32.0);
EXPECT_FLOAT_EQ(result, 32.0);
}
TEST(TestVec3Oper, Addition)
@ -84,9 +84,9 @@ TEST(TestVec3Oper, Addition)
Vec3 b(4.0,5.0,6.0);
Vec3 result = a + b;
EXPECT_TRUE(result.x == 5.0);
EXPECT_TRUE(result.y == 7.0);
EXPECT_TRUE(result.z == 9.0);
EXPECT_FLOAT_EQ(result.x, 5.0);
EXPECT_FLOAT_EQ(result.y, 7.0);
EXPECT_FLOAT_EQ(result.z, 9.0);
}
TEST(TestVec3Oper, Subtraction)
@ -95,17 +95,17 @@ TEST(TestVec3Oper, Subtraction)
Vec3 b(4.0,5.0,6.0);
Vec3 result = a - b;
EXPECT_TRUE(result.x == -3.0);
EXPECT_TRUE(result.y == -3.0);
EXPECT_TRUE(result.z == -3.0);
EXPECT_FLOAT_EQ(result.x, -3.0);
EXPECT_FLOAT_EQ(result.y, -3.0);
EXPECT_FLOAT_EQ(result.z, -3.0);
}
TEST(TestVec3Oper, Length)
{
Vec3 a(1.0,1.0,1.0);
double sqrt3 = sqrt(3.0);
Vec3 a(1.0,2.0,3.0);
double alen = sqrt(14.0);
EXPECT_FLOAT_EQ(a.length(), sqrt3);
EXPECT_FLOAT_EQ(a.length(), alen);
}
TEST(TestVec3Oper, Equality)
@ -133,7 +133,7 @@ TEST(TestVec3Oper, Less)
Vec3 a(1.0,2.0,3.0);
Vec3 b(4.0,5.0,6.0);
EXPECT_TRUE(a < b);
EXPECT_TRUE (a < b);
EXPECT_FALSE(b < a);
}
@ -153,7 +153,7 @@ TEST(TestVec3Oper, StreamIn)
Vec3 result;
str >> result;
EXPECT_TRUE(result.x == 1.0);
EXPECT_TRUE(result.y == 2.0);
EXPECT_TRUE(result.z == 3.0);
EXPECT_FLOAT_EQ(result.x, 1.0);
EXPECT_FLOAT_EQ(result.y, 2.0);
EXPECT_FLOAT_EQ(result.z, 3.0);
}