Skip to content

Commit e8ac46f

Browse files
PearCodingPearCoding
committed
Fix of coverage
1 parent 05ca99d commit e8ac46f

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎src/tests/Test.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
template<typename T1, typename T2>
1313
bool _prt_test_eq(const T1& v1, const T2& v2)
1414
{
15-
return v1 == v2;
15+
return v1 == (T1)v2;
1616
}
1717

1818
template<typename T1, typename T2>
1919
bool _prt_test_greater(const T1& v1, const T2& v2)
2020
{
21-
return v1 > v2;
21+
return v1 > (T1)v2;
2222
}
2323

2424
template<typename T1, typename T2>

‎src/tests/plane.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ PR_BEGIN_TESTCASE(Plane)
99
PR_TEST("Size")
1010
{
1111
Plane plane(10, 10);
12-
PR_CHECK_EQ(plane.xAxis().norm(), 10);
13-
PR_CHECK_EQ(plane.yAxis().norm(), 10);
14-
PR_CHECK_EQ(plane.surfaceArea(), 100);
12+
PR_CHECK_EQ(plane.xAxis().norm(), 10.0f);
13+
PR_CHECK_EQ(plane.yAxis().norm(), 10.0f);
14+
PR_CHECK_EQ(plane.surfaceArea(), 100.0f);
1515
}
1616

1717
PR_TEST("Axis")
1818
{
1919
Plane plane(Vector3f(0, 0, 0), Vector3f(10, 0, 0), Vector3f(0, 10, 0));
20-
PR_CHECK_EQ(plane.xAxis().norm(), 10);
21-
PR_CHECK_EQ(plane.yAxis().norm(), 10);
22-
PR_CHECK_EQ(plane.surfaceArea(), 100);
20+
PR_CHECK_EQ(plane.xAxis().norm(), 10.0f);
21+
PR_CHECK_EQ(plane.yAxis().norm(), 10.0f);
22+
PR_CHECK_EQ(plane.surfaceArea(), 100.0f);
2323
}
2424

2525
PR_TEST("Normal")
@@ -71,9 +71,9 @@ PR_TEST("Intersects 1")
7171
SingleCollisionOutput s;
7272
plane.intersects(ray, s);
7373

74-
PR_CHECK_NEARLY_EQ(s.HitDistance, 1);
75-
PR_CHECK_NEARLY_EQ(s.UV[0], 0.5);
76-
PR_CHECK_NEARLY_EQ(s.UV[1], 0.5);
74+
PR_CHECK_NEARLY_EQ(s.HitDistance, 1.0f);
75+
PR_CHECK_NEARLY_EQ(s.UV[0], 0.5f);
76+
PR_CHECK_NEARLY_EQ(s.UV[1], 0.5f);
7777
}
7878

7979
PR_TEST("Intersects 2")
@@ -97,9 +97,9 @@ PR_TEST("Intersects 3")
9797
SingleCollisionOutput s;
9898
plane.intersects(ray, s);
9999

100-
PR_CHECK_NEARLY_EQ(s.HitDistance, 1);
101-
PR_CHECK_NEARLY_EQ(s.UV[0], 0.5);
102-
PR_CHECK_NEARLY_EQ(s.UV[1], 0.5);
100+
PR_CHECK_NEARLY_EQ(s.HitDistance, 1.0f);
101+
PR_CHECK_NEARLY_EQ(s.UV[0], 0.5f);
102+
PR_CHECK_NEARLY_EQ(s.UV[1], 0.5f);
103103
}
104104

105105
PR_TEST("Intersects 4")
@@ -111,9 +111,9 @@ PR_TEST("Intersects 4")
111111
SingleCollisionOutput s;
112112
plane.intersects(ray, s);
113113

114-
PR_CHECK_NEARLY_EQ(s.HitDistance, 1);
115-
PR_CHECK_NEARLY_EQ(s.UV[0], 0.5);
116-
PR_CHECK_NEARLY_EQ(s.UV[1], 0.5);
114+
PR_CHECK_NEARLY_EQ(s.HitDistance, 1.0f);
115+
PR_CHECK_NEARLY_EQ(s.UV[0], 0.5f);
116+
PR_CHECK_NEARLY_EQ(s.UV[1], 0.5f);
117117
}
118118

119119
PR_END_TESTCASE()

‎src/tests/simd.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ PR_BEGIN_TESTCASE(SIMD)
88
PR_TEST("extract")
99
{
1010
vfloat f1 = simdpp::make_float(0, 1, 2, 3);
11-
PR_CHECK_NEARLY_EQ(extract(0, f1), 0);
12-
PR_CHECK_NEARLY_EQ(extract(1, f1), 1);
13-
PR_CHECK_NEARLY_EQ(extract(2, f1), 2);
14-
PR_CHECK_NEARLY_EQ(extract(3, f1), 3);
11+
PR_CHECK_NEARLY_EQ(extract(0, f1), 0.0f);
12+
PR_CHECK_NEARLY_EQ(extract(1, f1), 1.0f);
13+
PR_CHECK_NEARLY_EQ(extract(2, f1), 2.0f);
14+
PR_CHECK_NEARLY_EQ(extract(3, f1), 3.0f);
1515

1616
vuint32 i1 = simdpp::make_uint(0, 1, 2, 3);
1717
PR_CHECK_EQ(extract(0, i1), 0);
@@ -24,7 +24,7 @@ PR_TEST("insert")
2424
{
2525
vfloat f1 = simdpp::make_float(0, 1, 2, 3);
2626
f1 = insert(0, f1, 42);
27-
PR_CHECK_NEARLY_EQ(extract(0, f1), 42);
27+
PR_CHECK_NEARLY_EQ(extract(0, f1), 42.0f);
2828

2929
vuint32 i1 = simdpp::make_uint(0, 1, 2, 3);
3030
i1 = insert(0, i1, 42);
@@ -38,10 +38,10 @@ PR_TEST("load_from_container_linear")
3838
vfloat f1;
3939
load_from_container_linear(f1, c);
4040

41-
PR_CHECK_NEARLY_EQ(extract(0, f1), 0);
42-
PR_CHECK_NEARLY_EQ(extract(1, f1), 1);
43-
PR_CHECK_NEARLY_EQ(extract(2, f1), 2);
44-
PR_CHECK_NEARLY_EQ(extract(3, f1), 3);
41+
PR_CHECK_NEARLY_EQ(extract(0, f1), 0.0f);
42+
PR_CHECK_NEARLY_EQ(extract(1, f1), 1.0f);
43+
PR_CHECK_NEARLY_EQ(extract(2, f1), 2.0f);
44+
PR_CHECK_NEARLY_EQ(extract(3, f1), 3.0f);
4545
}
4646

4747
PR_TEST("load_from_container")
@@ -51,10 +51,10 @@ PR_TEST("load_from_container")
5151

5252
vfloat f1 = load_from_container(ind, c);
5353

54-
PR_CHECK_NEARLY_EQ(extract(0, f1), 0);
55-
PR_CHECK_NEARLY_EQ(extract(1, f1), 1);
56-
PR_CHECK_NEARLY_EQ(extract(2, f1), 2);
57-
PR_CHECK_NEARLY_EQ(extract(3, f1), 3);
54+
PR_CHECK_NEARLY_EQ(extract(0, f1), 0.0f);
55+
PR_CHECK_NEARLY_EQ(extract(1, f1), 1.0f);
56+
PR_CHECK_NEARLY_EQ(extract(2, f1), 2.0f);
57+
PR_CHECK_NEARLY_EQ(extract(3, f1), 3.0f);
5858
}
5959

6060
PR_TEST("store_into_container")
@@ -65,10 +65,10 @@ PR_TEST("store_into_container")
6565

6666
store_into_container(ind, c, f1);
6767

68-
PR_CHECK_NEARLY_EQ(c[0], 0);
69-
PR_CHECK_NEARLY_EQ(c[2], 1);
70-
PR_CHECK_NEARLY_EQ(c[4], 2);
71-
PR_CHECK_NEARLY_EQ(c[6], 3);
68+
PR_CHECK_NEARLY_EQ(c[0], 0.0f);
69+
PR_CHECK_NEARLY_EQ(c[2], 1.0f);
70+
PR_CHECK_NEARLY_EQ(c[4], 2.0f);
71+
PR_CHECK_NEARLY_EQ(c[6], 3.0f);
7272
}
7373

7474
PR_END_TESTCASE()

0 commit comments

Comments
 (0)