[Scummvm-git-logs] scummvm master -> 322af3e49ae800f45eae39e4f081197cba0b9a3f

[dafioram]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
322af3e49a TESTS: Use relative difference for math tests


Commit: 322af3e49ae800f45eae39e4f081197cba0b9a3f
    https://github.com/scummvm/scummvm/commit/322af3e49ae800f45eae39e4f081197cba0b9a3f
Author: David Fioramonti (dafioram at gmail.com)
Date: 2019-04-11T17:20:00-07:00

Commit Message:
TESTS: Use relative difference for math tests

Also add double template variants and use already defined delta
assert macro.

Changed paths:
    test/common/math.h


diff --git a/test/common/math.h b/test/common/math.h
index 0d70264..5010ca5 100644
--- a/test/common/math.h
+++ b/test/common/math.h
@@ -2,13 +2,7 @@
 
 #include "common/math.h"
 
-// Macro function for asserting that the compared values x and y
-// aren't further apart from each other than z.
-
-#define TS_ASSERT_ALMOST_EQUALS(x, y, z) \
-	TS_ASSERT_LESS_THAN_EQUALS(((x) - (y)) >= 0 ? (x) - (y) : (y) - (x), z)
-
-const float MAX_ERROR = 0.001;
+const float MAX_ERROR = 1e-7;
 class MathTestSuite : public CxxTest::TestSuite
 {
 	public:
@@ -24,16 +18,28 @@ class MathTestSuite : public CxxTest::TestSuite
 	}
 	
 	void test_rad2deg() {
-		TS_ASSERT_ALMOST_EQUALS(Common::rad2deg(0), 0, MAX_ERROR);
-		TS_ASSERT_ALMOST_EQUALS(Common::rad2deg(M_PI), 180.0, MAX_ERROR);
-		TS_ASSERT_ALMOST_EQUALS(Common::rad2deg(2.0 * M_PI), 360.0, MAX_ERROR);
-		TS_ASSERT_ALMOST_EQUALS(Common::rad2deg(M_PI / 2.0), 90.0, MAX_ERROR);
+		//float verion
+		TS_ASSERT_DELTA(Common::rad2deg(0), 0, MAX_ERROR);
+		TS_ASSERT_DELTA(Common::rad2deg(M_PI), 180.0, 180.0 * MAX_ERROR);
+		TS_ASSERT_DELTA(Common::rad2deg(2.0 * M_PI), 360.0, 360.0 * MAX_ERROR);
+		TS_ASSERT_DELTA(Common::rad2deg(M_PI / 2.0), 90.0, 90.0 * MAX_ERROR);
+		//double version
+		TS_ASSERT_DELTA(Common::rad2deg<double>(0), 0, MAX_ERROR);
+		TS_ASSERT_DELTA(Common::rad2deg<double>(M_PI), 180.0, 180.0 * MAX_ERROR);
+		TS_ASSERT_DELTA(Common::rad2deg<double>(2.0 * M_PI), 360.0, 360.0 * MAX_ERROR);
+		TS_ASSERT_DELTA(Common::rad2deg<double>(M_PI / 2.0), 90.0, 90.0 * MAX_ERROR);		
 	}
 
 	void test_deg2rad() {
-		TS_ASSERT_ALMOST_EQUALS(Common::deg2rad(0), 0, MAX_ERROR);
-		TS_ASSERT_ALMOST_EQUALS(Common::deg2rad(180.0), M_PI, MAX_ERROR);
-		TS_ASSERT_ALMOST_EQUALS(Common::deg2rad(360.0), 2.0 * M_PI, MAX_ERROR);
-		TS_ASSERT_ALMOST_EQUALS(Common::deg2rad(90.0), M_PI / 2.0, MAX_ERROR);
+		//float verion
+		TS_ASSERT_DELTA(Common::deg2rad(0), 0, MAX_ERROR);
+		TS_ASSERT_DELTA(Common::deg2rad(180.0), M_PI, M_PI * MAX_ERROR);
+		TS_ASSERT_DELTA(Common::deg2rad(360.0), 2.0 * M_PI, 2.0 * M_PI * MAX_ERROR);
+		TS_ASSERT_DELTA(Common::deg2rad(90.0), M_PI / 2.0, M_PI / 2.0 * MAX_ERROR);
+		//double version
+		TS_ASSERT_DELTA(Common::deg2rad<double>(0), 0,  MAX_ERROR);
+		TS_ASSERT_DELTA(Common::deg2rad<double>(180.0), M_PI, M_PI * MAX_ERROR);
+		TS_ASSERT_DELTA(Common::deg2rad<double>(360.0), 2.0 * M_PI, 2.0 * M_PI * MAX_ERROR);
+		TS_ASSERT_DELTA(Common::deg2rad<double>(90.0), M_PI / 2.0, M_PI / 2.0 * MAX_ERROR);		
 	}
 };