test vector3 using matrix::isEqual

PX4 · Feb 25, 2017 · cf92495 · cf92495
1 parent d81ddb0
commit cf92495
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/test/vector.cpp b/test/vector.cpp
@@ -2,8 +2,8 @@
 
 #include <matrix/math.hpp>
 
-using matrix::Vector;
 using matrix::isEqualF;
+using matrix::Vector;
 
 int main()
 {

diff --git a/test/vector2.cpp b/test/vector2.cpp
@@ -4,8 +4,8 @@
 
 #include "test_macros.hpp"
 
-using matrix::Vector2f;
 using matrix::Matrix;
+using matrix::Vector2f;
 
 int main()
 {

diff --git a/test/vector3.cpp b/test/vector3.cpp
@@ -2,31 +2,33 @@
 
 #include <matrix/math.hpp>
 
-using matrix::Vector3f;
+using matrix::isEqual;
+using matrix::isEqualF;
 using matrix::Matrix;
+using matrix::Vector3f;
 
 int main()
 {
     Vector3f a(1, 0, 0);
     Vector3f b(0, 1, 0);
     Vector3f c = a.cross(b);
-    TEST(matrix::isEqual(c, Vector3f(0,0,1)));
+    TEST(isEqual(c, Vector3f(0,0,1)));
     c = a % b;
-    TEST(matrix::isEqual(c, Vector3f(0,0,1)));
+    TEST(isEqual(c, Vector3f(0,0,1)));
     Matrix<float, 3, 1> d(c);
     Vector3f e(d);
-    TEST (matrix::isEqual(e, d));
+    TEST(isEqual(e, d));
     float data[] = {4, 5, 6};
     Vector3f f(data);
-    TEST(matrix::isEqual(f, Vector3f(4, 5, 6)));
+    TEST(isEqual(f, Vector3f(4, 5, 6)));
 
-    TEST(matrix::isEqual(a + b, Vector3f(1, 1, 0)));
-    TEST(matrix::isEqual(a - b, Vector3f(1, -1, 0)));
-    TEST(matrix::isEqualF(a * b, 0.0f));
-    TEST(matrix::isEqual(-a, Vector3f(-1, 0, 0)));
-    TEST(matrix::isEqual(a.unit(), a));
-    TEST(matrix::isEqual(a.unit(), a.normalized()));
-    TEST(matrix::isEqual(a*2.0, Vector3f(2, 0, 0)));
+    TEST(isEqual(a + b, Vector3f(1, 1, 0)));
+    TEST(isEqual(a - b, Vector3f(1, -1, 0)));
+    TEST(isEqualF(a * b, 0.0f));
+    TEST(isEqual(-a, Vector3f(-1, 0, 0)));
+    TEST(isEqual(a.unit(), a));
+    TEST(isEqual(a.unit(), a.normalized()));
+    TEST(isEqual(a*2.0, Vector3f(2, 0, 0)));
 
     return 0;
 }