Diff: TestAccelerometer.cpp

Revision:

6:3facf0329142

Parent:

5:f59b51ac4b40

Child:

8:862e28c7f6f6

--- a/TestAccelerometer.cpp	Sun Jan 15 01:34:25 2017 +0000
+++ b/TestAccelerometer.cpp	Sun Jan 15 02:04:23 2017 +0000
@@ -1,5 +1,6 @@
 #include "TestAccelerometer.hpp"
 #include "Accelerometer.hpp"
+#include "Utility.hpp"
 #include "mbed.h"
 
 #include <cassert>
@@ -11,7 +12,8 @@
     {
         test_raw_axis_data_to_int();
         test_set_standby_and_active();
-        test_is_almost_equal();
+        test_g_force_from_int_axis_data();
+        test_angle_from_int_axis_data();
     }
     
     void test_raw_axis_data_to_int()
@@ -44,54 +46,24 @@
             printf("Fail\r\n");
         }
     }
-
-    void test_is_almost_equal()
-    {
-        assert(is_almost_equal(0, 0, 0.01));
-        assert(is_almost_equal(0.50, 0.51, 0.02));
-        assert(!is_almost_equal(0.50, 0.52, 0.01));
-        assert(!is_almost_equal(0, 0.50, 0.1));
-    }
     
     void test_angle_from_int_axis_data()
     {
         const double tolerance = 0.05;
-        assert(is_almost_equal(0, angle_from_int_axis_data(64), tolerance));
-        assert(is_almost_equal(0, angle_from_int_axis_data(-64), tolerance));
-        assert(is_almost_equal(60, angle_from_int_axis_data(32), tolerance));
-        assert(is_almost_equal(60, angle_from_int_axis_data(-32), tolerance));
+        assert(utility::is_almost_equal(0, angle_from_int_axis_data(64), tolerance));
+        assert(utility::is_almost_equal(0, angle_from_int_axis_data(-64), tolerance));
+        assert(utility::is_almost_equal(60, angle_from_int_axis_data(32), tolerance));
+        assert(utility::is_almost_equal(60, angle_from_int_axis_data(-32), tolerance));
     }
     
     void test_g_force_from_int_axis_data()
     {
         const double tolerance = 0.05;
-        assert(is_almost_equal(1, g_force_from_int_axis_data(64), tolerance));
-        assert(is_almost_equal(-1, g_force_from_int_axis_data(-64), tolerance));
-        assert(is_almost_equal(2, g_force_from_int_axis_data(128), tolerance));
-        assert(is_almost_equal(-2, g_force_from_int_axis_data(-128), tolerance));
-        assert(is_almost_equal(0.5, g_force_from_int_axis_data(32), tolerance));
-        assert(is_almost_equal(-0.5, g_force_from_int_axis_data(-32), tolerance));
-    }
-    
-    void test_degree_from_radian()
-    {
-        const double tolerance = 0.05;
-        assert(is_almost_equal(0, degree_from_radian(0.0), tolerance));
-        assert(is_almost_equal(90, degree_from_radian(PI/2.0), tolerance));
-        assert(is_almost_equal(180, degree_from_radian(PI), tolerance));
-        assert(is_almost_equal(270, degree_from_radian(3.0*PI/2.0), tolerance));
-        assert(is_almost_equal(0, degree_from_radian(2.0*PI), tolerance) || is_almost_equal(360, degree_from_radian(2.0*PI), tolerance));
-        assert(is_almost_equal(270, degree_from_radian(-PI/2.0), tolerance));
-    }
-    
-    void test_wrap_angle()
-    {
-        const double tolerance = 0.05;
-        assert(is_almost_equal(0, wrap_angle(0.0), tolerance));
-        assert(is_almost_equal(90, wrap_angle(90), tolerance));
-        assert(is_almost_equal(180, wrap_angle(180), tolerance));
-        assert(is_almost_equal(0, wrap_angle(360), tolerance) || is_almost_equal(360, wrap_angle(360), tolerance));
-        assert(is_almost_equal(90, wrap_angle(360+90), tolerance));
-        assert(is_almost_equal(270, wrap_angle(360-90), tolerance));
+        assert(utility::is_almost_equal(1, g_force_from_int_axis_data(64), tolerance));
+        assert(utility::is_almost_equal(-1, g_force_from_int_axis_data(-64), tolerance));
+        assert(utility::is_almost_equal(2, g_force_from_int_axis_data(128), tolerance));
+        assert(utility::is_almost_equal(-2, g_force_from_int_axis_data(-128), tolerance));
+        assert(utility::is_almost_equal(0.5, g_force_from_int_axis_data(32), tolerance));
+        assert(utility::is_almost_equal(-0.5, g_force_from_int_axis_data(-32), tolerance));
     }
 }
\ No newline at end of file