From 8d7271ce74a1550c1987e94e1770cd9fe0aeb865 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 2 Jun 2019 16:21:40 +0300
Subject: [PATCH] Improve readability of Matrix test cases with typedefs

---
 tests/matrix.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/matrix.cpp b/tests/matrix.cpp
index 1b01cbc..6f57888 100644
--- a/tests/matrix.cpp
+++ b/tests/matrix.cpp
@@ -8,6 +8,12 @@ using namespace Msp;
 
 class MatrixTests: public Test::RegisteredTest<MatrixTests>
 {
+private:
+	typedef LinAl::SquareMatrix<double, 2> Matrix2d;
+	typedef LinAl::Matrix<double, 3, 2> Matrix3x2d;
+	typedef LinAl::Matrix<double, 2, 3> Matrix2x3d;
+	typedef LinAl::SquareMatrix<double, 3> Matrix3d;
+
 public:
 	MatrixTests();
 
@@ -22,7 +28,7 @@ private:
 MatrixTests::MatrixTests()
 {
 	add(&MatrixTests::multiply, "Multiplication");
-	add(&MatrixTests::invert,   "Inversion");
+	add(&MatrixTests::invert, "Inversion");
 }
 
 void MatrixTests::multiply()
@@ -35,10 +41,10 @@ void MatrixTests::multiply()
 		9, 3, 9, 6
 	};
 
-	LinAl::Matrix<double, 3, 2> a(data);
-	LinAl::Matrix<double, 2, 3> b(data+6);
-	EXPECT_EQUAL(a*b, (LinAl::Matrix<double, 3, 3>(data+12)));
-	EXPECT_EQUAL(b*a, (LinAl::Matrix<double, 2, 2>(data+21)));
+	Matrix3x2d a(data);
+	Matrix2x3d b(data+6);
+	EXPECT_EQUAL(a*b, Matrix3d(data+12));
+	EXPECT_EQUAL(b*a, Matrix2d(data+21));
 }
 
 template<typename T, unsigned N>
@@ -59,7 +65,7 @@ void MatrixTests::invert()
 		1, 4, 2, 4, 8, 6, 2, 2, 4
 	};
 
-	LinAl::SquareMatrix<double, 3> m(data);
-	LinAl::SquareMatrix<double, 3> i = LinAl::invert(m);
+	Matrix3d m(data);
+	Matrix3d i = LinAl::invert(m);
 	EXPECT(is_identity(i*m));
 }
-- 
2.43.0